ci: generate xunit report for s2

dCache · Apr 5, 2024 · b03dd5a · b03dd5a
1 parent 358bb3b
commit b03dd5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/.ci/init-s2.sh b/.ci/init-s2.sh
@@ -40,35 +40,11 @@ export SRM_ENDPOINT="srm://${SRM_HOST}:${SRM_PORT}/srm/managerv2?SFN=${SRM_DATAP
 export USER=dcache-ci
 
 RC=0
-FAILED_TESTS=""
-PASSED_TESTS=""
-
-for i in /usr/share/s2/testing/scripts/protos/srm/2.2/{avail,basic,usecase}/*.s2
+for i in /usr/share/s2/testing/scripts/protos/srm/2.2/{avail,basic,usecase}
 do
-  t=`basename $i`
-  echo -n "$t : "
-  cmd=`(echo $i | sed -e 's/\.s2$/\.sh/')`
-  $cmd > /dev/null 2>&1
-  rc=$?
-  if [ $rc -ne 0 ]; then
+  S2_LOGS_DIR=/ /usr/bin/xrunner.py -d $i
+  if [ $? -ne 0 ]; then
     RC=1
-    echo "FAILED"
-    FAILED_TESTS="$FAILED_TESTS $t"
-    ofile=`(echo $i | sed -e 's/\.s2$/\.out/')`
-    cat `basename $ofile`
-
-    efile=`(echo $i | sed -e 's/\.s2$/\.e1/')`
-    cat `basename $ofile`
-  else
-    echo "PASSED"
-    PASSED_TESTS="$PASSED_TESTS $t"
   fi
 done
-
-echo
-echo
-echo "PASSED_TESTS: $PASSED_TESTS"
-echo
-echo
-echo "FAILED_TESTS: $FAILED_TESTS"
 exit $RC
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -468,10 +468,13 @@ SRM S2 test suite:
     - while ! kubectl -n $K8S_NAMESPACE wait --for=condition=Ready pod s2-tester; do sleep 1; done
     - kubectl -n $K8S_NAMESPACE cp .ci/init-s2.sh s2-tester:/init-s2.sh
     - kubectl -n $K8S_NAMESPACE exec s2-tester -- /bin/sh /init-s2.sh
+    - kubectl -n $K8S_NAMESPACE cp s2-tester:/TEST-basic.xml TEST-basic.xml
+    - kubectl -n $K8S_NAMESPACE cp s2-tester:/TEST-avail.xml TEST-avail.xml
+    - kubectl -n $K8S_NAMESPACE cp s2-tester:/TEST-usecase.xml TEST-usecase.xml
   artifacts:
     reports:
       junit:
-        - "xunit*.xml"
+        - "TEST*.xml"
 
 gsi_xroot_tests:
   stage: testing