Fixed RESULT_FILE_NAME variable

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
jakartaee · Dec 13, 2022 · fe598a0 · fe598a0
1 parent 04ea60f
commit fe598a0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh
@@ -190,17 +190,20 @@ on_exit () {
     rm -f "${CTS_HOME}/args.txt"
 
     if [ -z "${vehicle}" ]; then
-      RESULT_FILE_NAME="${TEST_SUITE}-results.tar.gz"
       JUNIT_REPORT_FILE_NAME="${TEST_SUITE}-junitreports.tar.gz"
     else
-      RESULT_FILE_NAME="${TEST_SUITE}_${vehicle_name}-results.tar.gz"
       JUNIT_REPORT_FILE_NAME="${TEST_SUITE}_${vehicle_name}-junitreports.tar.gz"
       sed -i.bak "s/name=\"${TEST_SUITE}\"/name=\"${TEST_SUITE}_${vehicle_name}\"/g" "${WORKSPACE}/results/junitreports/${TEST_SUITE}-junit-report.xml"
       mv "${WORKSPACE}/results/junitreports/${TEST_SUITE}-junit-report.xml" "${WORKSPACE}/results/junitreports/${TEST_SUITE}_${vehicle_name}-junit-report.xml"
     fi
     tar zcf "${JUNIT_REPORT_FILE_NAME}" -C "${WORKSPACE}" "results/junitreports/" || true
   fi
 
+  if [ -z "${vehicle}" ]; then
+    RESULT_FILE_NAME="${TEST_SUITE}-results.tar.gz"
+  else
+    RESULT_FILE_NAME="${TEST_SUITE}_${vehicle_name}-results.tar.gz"
+  fi
   tar zcf "${WORKSPACE}/${RESULT_FILE_NAME}" --ignore-failed-read -C "${WORKSPACE}"\
     "${CTS_HOME}/*.log"\
     "${JT_REPORT_DIR}"\