ci: split el9 wn initialization from s2 tests

.ci/init-s2.sh → .ci/init-el9-ui.sh

@@ -1,5 +1,10 @@
 #!/bin/sh
 
+#
+# Required to support grid tools that sill use SHA1
+#
+update-crypto-policies --set DEFAULT:SHA1
+
 AUTOCA_URL=https://ci.dcache.org/ca
 
 dnf -q install -y epel-release which
@@ -27,24 +32,3 @@ python3 ./autoca-client -n -k userkey.pem -c usercert.pem ${AUTOCA_URL} "Kermit
 voms-proxy-init -cert=usercert.pem -key=userkey.pem -voms=desy
 voms-proxy-info -all
 
-# SLEEP_SOR is the sleep-time when polling an SRM GetStatusOf...Request
-export SLEEP_SOR=2
-export S2_SUPRESS_PROGRESS=1
-
-export SRM_HOST=store-door-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local
-export SRM_PORT=8443
-export SRM_DATAPATH=/data/s2
-export SRM_ENDPOINT="srm://${SRM_HOST}:${SRM_PORT}/srm/managerv2?SFN=${SRM_DATAPATH}"
-
-# s3 test depends on needs USER env to be set
-export USER=dcache-ci
-
-RC=0
-for i in /usr/share/s2/testing/scripts/protos/srm/2.2/{avail,basic,usecase}
-do
-  S2_LOGS_DIR=/ /usr/bin/xrunner.py -d $i
-  if [ $? -ne 0 ]; then
-    RC=1
-  fi
-done
-exit $RC

.ci/run-s2.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. /init-el9-ui.sh
+
+# SLEEP_SOR is the sleep-time when polling an SRM GetStatusOf...Request
+export SLEEP_SOR=2
+export S2_SUPRESS_PROGRESS=1
+
+export SRM_HOST=store-door-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local
+export SRM_PORT=8443
+export SRM_DATAPATH=/data/s2
+export SRM_ENDPOINT="srm://${SRM_HOST}:${SRM_PORT}/srm/managerv2?SFN=${SRM_DATAPATH}"
+
+# s3 test depends on needs USER env to be set
+export USER=dcache-ci
+
+RC=0
+for i in /usr/share/s2/testing/scripts/protos/srm/2.2/{avail,basic,usecase}
+do
+  S2_LOGS_DIR=/ /usr/bin/xrunner.py -d $i
+  if [ $? -ne 0 ]; then
+    RC=1
+  fi
+done
+exit $RC

.gitlab-ci.yml

@@ -480,8 +480,9 @@ SRM S2 test suite:
   script:
     - kubectl -n $K8S_NAMESPACE apply -f .ci/s2-runner.yaml
     - 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 .ci/init-el9-ui.sh s2-tester:/init-el9-ui.sh
+    - kubectl -n $K8S_NAMESPACE cp .ci/run-s2.sh s2-tester:/run-s2.sh
+    - kubectl -n $K8S_NAMESPACE exec s2-tester -- /bin/sh /run-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