Support Live Labs with 5 Digit Reservation ID (#212)

* Update main-setup.sh

Support 5 digit live labs reservation ID

* Update main-test.sh

Commented out the tracing tests as they are not working because they changed and have moved to observability

Author: RichardExley

grabdish/utils/main-setup.sh

@@ -21,10 +21,10 @@ fi
 
 # Identify Run Type
 while ! state_done RUN_TYPE; do
-  if [[ "$HOME" =~ /home/ll[0-9]{1,4}_use$ ]]; then
-    # Green Button
+  if [[ "$HOME" =~ /home/ll[0-9]{1,5}_us ]]; then
+    # Green Button (hosted by Live Labs)
     state_set RUN_TYPE "3"
-    state_set RESERVATION_ID `grep -oP '(?<=/home/ll).*?(?=_use)' <<<"$HOME"`
+    state_set RESERVATION_ID `grep -oP '(?<=/home/ll).*?(?=_us)' <<<"$HOME"`
     state_set USER_OCID 'NA'
     state_set USER_NAME "LL$(state_get RESERVATION_ID)-USER"
     state_set_done PROVISIONING

grabdish/utils/main-test.sh

@@ -117,15 +117,15 @@ utils/scaling-test.sh
 #
 #
 ## TRACING
-echo "TEST_LOG: #### Testing Lab5: Tracing"
-utils/tracing-test.sh
+#echo "TEST_LOG: #### Testing Lab5: Tracing"
+#utils/tracing-test.sh
 
 
 # APEX
 # TODO
 
 
-# TRACING
+# TRANSACTIONAL
 echo "TEST_LOG: #### Testing Lab7: Transactional Tests: Compare MongoDB, Postgres, and Kafka to Oracle DB with TEQ/AQ"
 utils/crashrecovery-test.sh