Move all outcome files in selenium to mktemp -d

Author: MarcialRosales

.github/workflows/test-authnz.yaml

@@ -72,22 +72,19 @@ jobs:
         docker build -t mocha-test --target test .
 
     - name: Run Suites
-      run: |
+      run: |        
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
-        RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
+        CONF_DIR_PREFIX="$(mktemp -d)" RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
          ${SELENIUM_DIR}/run-suites.sh full-suite-authnz-messaging
-        mkdir -p /tmp/full-suite-authnz-messaging
-        mv /tmp/selenium/* /tmp/full-suite-authnz-messaging
+        echo "CONF_DIR_PREFIX=$CONF_DIR_PREFIX" >> $GITHUB_ENV
         
     - name: Upload Test Artifacts
       if: always()
       uses: actions/[email protected]
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
         path: |
-          logs/*
-          screens/*
-          /tmp/selenium/*
+           ${{ env.CONF_DIR_PREFIX }}/*
 
   summary-selenium:
     needs:

.github/workflows/test-management-ui-for-pr.yaml

@@ -59,19 +59,14 @@ jobs:
     - name: Run short UI suites on a standalone rabbitmq server
       run: |
         IMAGE_TAG=$(find PACKAGES/rabbitmq-server-generic-unix-*.tar.xz | awk -F 'PACKAGES/rabbitmq-server-generic-unix-|.tar.xz' '{print $2}')
-        RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
+        CONF_DIR_PREFIX="$(mktemp -d)" RABBITMQ_DOCKER_IMAGE=pivotalrabbitmq/rabbitmq:$IMAGE_TAG \
           ${SELENIUM_DIR}/run-suites.sh short-suite-management-ui        
-
-    - name: Prepare logs for upload
-      if: ${{ failure() && steps.tests.outcome == 'failed' }}
-      run: |
-        mkdir -p /tmp/short-suite
-        mv /tmp/selenium/* /tmp/short-suite
+        echo "CONF_DIR_PREFIX=$CONF_DIR_PREFIX" >> $GITHUB_ENV
         
     - name: Upload Test Artifacts
       if: ${{ failure() && steps.tests.outcome == 'failed' }}
       uses: actions/upload-artifact@v4
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}
         path: |
-          /tmp/short-suite
+          ${{ env.CONF_DIR_PREFIX }}/*

selenium/bin/suite_template

@@ -30,9 +30,12 @@ find_selenium_dir() {
 SELENIUM_ROOT_FOLDER=$(find_selenium_dir $SCRIPT)
 TEST_DIR=$SELENIUM_ROOT_FOLDER/test
 BIN_DIR=$SELENIUM_ROOT_FOLDER/bin
-SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
-CONF_DIR_PREFIX=$(mktemp -d) 
+if [[ -z "${CONF_DIR_PREFIX}" ]]; then
+  CONF_DIR_PREFIX=$(mktemp -d)
+fi
 CONF_DIR=${CONF_DIR_PREFIX}/selenium/${SUITE}
+SCREENS=${CONF_DIR}/screens
+
 LOGS=${CONF_DIR}/logs
 ENV_FILE=$CONF_DIR/.env
 OTHER_ENV_FILE=$CONF_DIR/.other.env
@@ -117,6 +120,7 @@ init_suite() {
 
   begin "Initializing suite $SUITE ..."
   print "> REQUIRED_COMPONENTS: ${REQUIRED_COMPONENTS[*]}"
+  print "> CONF_DIR_PREFIX: ${CONF_DIR_PREFIX} "
   print "> CONF_DIR: ${CONF_DIR} "
   print "> TEST_CASES_DIR: ${TEST_CASES_DIR} "
   print "> TEST_CONFIG_DIR: ${TEST_CONFIG_DIR} "
@@ -130,8 +134,8 @@ init_suite() {
   print "> COMMAND: ${COMMAND}"
   end "Initialized suite"
 
-  mkdir -p ${LOGS}/${SUITE}
-  mkdir -p ${SCREENS}/${SUITE}
+  mkdir -p ${LOGS}
+  mkdir -p ${SCREENS}
 }
 
 build_mocha_image() {
@@ -358,8 +362,15 @@ _test() {
   mocha_test_tag=($(md5sum $SELENIUM_ROOT_FOLDER/package.json))
 
   generate_node_extra_ca_cert
-  MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR}/node_ca_certs.pem
-  print "> MOUNT_NODE_EXTRA_CA_CERTS: ${MOUNT_NODE_EXTRA_CA_CERTS}"
+  MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR}/node
+  
+  EXTRA_ENV_VARS="" 
+  EXTRA_MOUNTS="" 
+  if [[ -f ${MOUNT_NODE_EXTRA_CA_CERTS}/node_ca_certs.pem ]]; then 
+    print "> MOUNT_NODE_EXTRA_CA_CERTS: ${MOUNT_NODE_EXTRA_CA_CERTS}"
+    EXTRA_ENV_VARS="${EXTRA_ENV_VARS} --env NODE_EXTRA_CA_CERTS=/nodejs/node_ca_certs.pem "
+    EXTRA_MOUNTS="${EXTRA_MOUNTS} -v ${MOUNT_NODE_EXTRA_CA_CERTS}:/nodejs "
+  fi 
 
   docker run \
     --rm \
@@ -375,12 +386,12 @@ _test() {
     --env PROFILES="${PROFILES}" \
     --env ENV_FILE="/code/.env" \
     --env RABBITMQ_CERTS=/etc/rabbitmq/certs \
-    --env NODE_EXTRA_CA_CERTS=/nodejs/ca.pem \
-    -v ${MOUNT_NODE_EXTRA_CA_CERTS}:/nodejs/ca.pem \
+    ${EXTRA_ENV_VARS} \
     -v ${TEST_DIR}:/code/test \
     -v ${TEST_CONFIG_DIR}/certs:/etc/rabbitmq/certs \
     -v ${SCREENS}:/screens \
     -v ${ENV_FILE}:/code/.env \
+    ${EXTRA_MOUNTS} \
     mocha-test:${mocha_test_tag} test /code/test${TEST_CASES_PATH}
 
   TEST_RESULT=$?
@@ -676,7 +687,7 @@ test_local() {
   export SELENIUM_POLLING=${SELENIUM_POLLING:-500}
 
   generate_node_extra_ca_cert
-  MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR}/node_ca_certs.pem
+  MOUNT_NODE_EXTRA_CA_CERTS=${CONF_DIR}/node/node_ca_certs.pem
 
   print "> SELENIUM_TIMEOUT: ${SELENIUM_TIMEOUT}"
   print "> SELENIUM_POLLING: ${SELENIUM_POLLING}"
@@ -740,16 +751,22 @@ save_components_logs() {
   end "Finished saving logs"
 }
 generate_node_extra_ca_cert() {  
-  echo "Generating ${CONF_DIR}/node_ca_certs.pem ..."
-  rm -f ${CONF_DIR}/node_ca_certs.pem  
+  begin "Generating ${CONF_DIR}/node/node_ca_certs.pem ..."
+  mkdir -p ${CONF_DIR}/node
+  rm -f ${CONF_DIR}/node/node_ca_certs.pem  
   env | while IFS= read -r line; do
     value=${line#*=}
     name=${line%%=*}
 
     if [[ $name == *NODE_EXTRA_CA_CERTS ]]
     then
-      echo "Adding ${TEST_DIR}/${value} to ${CONF_DIR}/node_ca_certs.pem ..."
-      cat ${TEST_DIR}/${value} >> ${CONF_DIR}/node_ca_certs.pem      
+      print "Adding ${TEST_DIR}/${value} to ${CONF_DIR}/node/node_ca_certs.pem ..."
+      cat ${TEST_DIR}/${value} >> ${CONF_DIR}/node/node_ca_certs.pem      
     fi 
-  done  
+  done
+  if [[ -f  ${CONF_DIR}/node/node_ca_certs.pem ]]; then 
+    end "Generated ${CONF_DIR}/node/node_ca_certs.pem"
+  else
+    end "Did not generate ${CONF_DIR}/node/node_ca_certs.pem"
+  fi 
 }