ci: common template rollout changes

splunk · Nov 6, 2023 · 1b9a2d2 · 1b9a2d2
1 parent 4b65b05
commit 1b9a2d2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 252 deletions.
diff --git a/.github/workflows/.ci-metadata.json b/.github/workflows/.ci-metadata.json
@@ -1,3 +1,3 @@
 {
-  "template-version": "v2.5.2"
+  "template-version": "v2.6.1"
 }
diff --git a/Dockerfile-splunk b/Dockerfile-splunk
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,12 +18,6 @@ services:
       - UI_TEST_HEADLESS=${UI_TEST_HEADLESS}
       - RERUN_COUNT=${RERUN_COUNT}
       - TEST_BROWSER=${TEST_BROWSER}
-      - RP_ENDPOINT=${RP_ENDPOINT}
-      - RP_UUID=${RP_UUID}
-      - RP_LAUNCH_ATTRIBUTES=${RP_LAUNCH_ATTRIBUTES}
-      - RP_PROJECT=${RP_PROJECT}
-      - RP_LAUNCH=${RP_LAUNCH}
-      - RP_LAUNCH_DESC=${RP_LAUNCH_DESC}
       - IMAGE_TAG=${IMAGE_TAG}
       - TEST_DEBUG=${TEST_DEBUG}
     env_file:
@@ -57,7 +51,7 @@ services:
     tty: true
     environment:
       - SPLUNK_HEC_URL=https://splunk:8088
-      - SPLUNK_HEC_TOKEN=9b741d03-43e9-4164-908b-e09102327d22
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
       - SC4S_SOURCE_TLS_ENABLE=no
       - SC4S_DEST_SPLUNK_HEC_TLS_VERIFY=no
       - SC4S_LISTEN_JUNIPER_NETSCREEN_TCP_PORT=5000
@@ -89,6 +83,7 @@ services:
     environment:
       - PROXY_USER=splunk_socks5
       - PROXY_PASSWORD=splunk_socks5
+
   splunk:
     build:
       context: .
@@ -106,14 +101,8 @@ services:
     environment:
       - SPLUNK_PASSWORD=Chang3d!
       - SPLUNK_START_ARGS=--accept-license
-      - SPLUNK_HEC_TOKEN=9b741d03-43e9-4164-908b-e09102327d22
+      - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
       - TEST_SET=${TEST_SET}
-      - RP_ENDPOINT=${RP_ENDPOINT}
-      - RP_UUID=${RP_UUID}
-      - RP_LAUNCH_ATTRIBUTES=${RP_LAUNCH_ATTRIBUTES}
-      - RP_PROJECT=${RP_PROJECT}
-      - RP_LAUNCH=${RP_LAUNCH}
-      - RP_LAUNCH_DESC=${RP_LAUNCH_DESC}
     env_file:
       - test_credentials.env
     volumes:
@@ -166,20 +155,6 @@ services:
     volumes:
       - results:/home/circleci/work
 
-  chrome-grid:
-    image: selenium/standalone-chrome-debug:91.0
-    shm_size: 2gb
-    ports:
-      - "6900:5900"
-      - "4444"
-
-  firefox-grid:
-    image: selenium/standalone-firefox-debug:90.0
-    shm_size: 2gb
-    ports:
-      - "6901:5900"
-      - "4444"
-
 volumes:
   results:
     external: false

diff --git a/tests/entrypoint.sh b/tests/entrypoint.sh
@@ -33,9 +33,6 @@ echo "Executing Tests..."
 RERUN_COUNT=${RERUN_COUNT:-1}
 if [ -z ${TEST_BROWSER} ]
 then
-    # echo Test Args $@ ${TEST_DEBUG}  --reportportal -o "rp_endpoint=${RP_ENDPOINT}" -o "rp_launch_attributes=${RP_LAUNCH_ATTRIBUTES}" \
-    # -o "rp_project=${RP_PROJECT}" -o "rp_launch=${RP_LAUNCH}" -o "rp_launch_description='${RP_LAUNCH_DESC}'" -o "rp_ignore_attributes='xfail' 'usefixture'" \
-    # ${TEST_SET}
     echo Test Args $@ ${TEST_DEBUG}
     ${TEST_SET}
 
@@ -45,10 +42,6 @@ then
         ${TEST_SET}
         test_exit_code=$?
     else
-        # pytest $@ ${TEST_DEBUG} \
-        # --reportportal -o "rp_endpoint=${RP_ENDPOINT}" -o "rp_launch_attributes=${RP_LAUNCH_ATTRIBUTES}" \
-        # -o "rp_project=${RP_PROJECT}" -o "rp_launch=${RP_LAUNCH}" -o "rp_launch_description='${RP_LAUNCH_DESC}'" -o "rp_ignore_attributes='xfail' 'usefixture'" \
-        # ${TEST_SET}
         pytest $@ ${TEST_DEBUG} \
         ${TEST_SET}
         test_exit_code=$?
@@ -62,15 +55,6 @@ else
     # Execute the tests on Headless mode in local if UI_TEST_HEADLESS environment is set to "true"
     if [ "${UI_TEST_HEADLESS}" = "true" ]
     then
-        # echo Test Args $@ ${TEST_DEBUG}  --local --persist-browser --headless --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER}\
-        # --reportportal -o "rp_endpoint=${RP_ENDPOINT}" -o "rp_launch_attributes=${RP_LAUNCH_ATTRIBUTES}" \
-        # -o "rp_project=${RP_PROJECT}" -o "rp_launch=${RP_LAUNCH}" -o "rp_launch_description='${RP_LAUNCH_DESC}'" -o "rp_ignore_attributes='xfail' 'usefixture'" \
-        # ${TEST_SET}
-
-        # pytest $@ ${TEST_DEBUG}  --local --persist-browser --headless --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER} \
-        # --reportportal -o "rp_endpoint=${RP_ENDPOINT}" -o "rp_launch_attributes=${RP_LAUNCH_ATTRIBUTES}" \
-        # -o "rp_project=${RP_PROJECT}" -o "rp_launch=${RP_LAUNCH}" -o "rp_launch_description='${RP_LAUNCH_DESC}'" -o "rp_ignore_attributes='xfail' 'usefixture'" \
-        # ${TEST_SET}
         pytest $@ ${TEST_DEBUG}  --local --persist-browser --headless --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER} \
         ${TEST_SET}
 
@@ -82,10 +66,6 @@ else
         echo "Sauce Connect Status:$sauce_connect_connection"
         [ "$sauce_connect_connection" -eq "4" ] && echo "SauceConnect is not running. Exiting the tests...." && exit 1
         echo Test Args $@  ${TEST_DEBUG}  --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER} ${TEST_SET}
-        # pytest $@ ${TEST_DEBUG} --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER} \
-        # --reportportal -o "rp_endpoint=${RP_ENDPOINT}" -o "rp_launch_attributes=${RP_LAUNCH_ATTRIBUTES}" \
-        # -o "rp_project=${RP_PROJECT}" -o "rp_launch=${RP_LAUNCH}" -o "rp_launch_description='${RP_LAUNCH_DESC}'" -o "rp_ignore_attributes='xfail' 'usefixture'" \
-        # ${TEST_SET}
         pytest $@ ${TEST_DEBUG} --reruns=${RERUN_COUNT} --browser=${TEST_BROWSER} \
         ${TEST_SET}
         test_exit_code=$?