ci: drop centos-7 based wn. drop cvmfs

(cherry picked from commit df1233d) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
dCache · Jul 29, 2024 · dfabdbb · dfabdbb
1 parent ea97630
commit dfabdbb
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 136 deletions.
diff --git a/.ci/init-el9-ui.sh b/.ci/init-el9-ui.sh
@@ -32,3 +32,7 @@ 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
 
+# standard location for the proxy
+export X509_USER_PROXY=/tmp/x509up_u$(id -u)
+
+
diff --git a/.ci/init-grid-ui.sh b/.ci/init-grid-ui.sh
diff --git a/.ci/run-grid-tests.sh b/.ci/run-grid-tests.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-. /init-grid-ui.sh
+. /init-el9-ui.sh
 
-yum install -y -q git-core python3-pip boost-python
+dnf install -y -q git-core python3-pip
+dnf install -y -q https://www.dcache.org/old/downloads/1.9/repo/9.2/dcache-srmclient-9.2.0-1.noarch.rpm
+dnf install -y -q dcap gfal2-all python3-gfal2-util
 
 # version that works with centos7
 pip3 install robotframework==3.2.2
@@ -31,7 +33,7 @@ TESTS="DccpTests GlobusurlcpTests SrmlsTests"
 declare -i ERRORS=0
 
 for name in $TESTS; do
-  robot -o ${name}_output --variable SRM_VERSION:2 --name ${name} -x /xunit/xunit-${name}.xml ${name}.robot || ERRORS+=$?
+  robot -o ${name}_output --name ${name} -x /xunit/xunit-${name}.xml ${name}.robot || ERRORS+=$?
 done
 
 exit $ERRORS
diff --git a/.ci/run-webdav-tests.sh b/.ci/run-webdav-tests.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-. /init-grid-ui.sh
+. /init-el9-ui.sh
 
-yum install -y -q python36-urllib3
+dnf install -y -q python3-urllib3
 
 
 export DFTS_SUT=https://store-door-svc.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local:8083

diff --git a/.ci/run-xroot-tests.sh b/.ci/run-xroot-tests.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-. /init-grid-ui.sh
+. /init-el9-ui.sh
+
+dnf -y -q install xrootd-client
 
 xrdcp -f /etc/profile xroot://store-door-svc:1095//data/testfile
 

diff --git a/.ci/webdav-wn-cvmfs.yaml b/.ci/webdav-wn-cvmfs.yaml
@@ -5,17 +5,6 @@ metadata:
 spec:
   containers:
     - name: tester
-      image: centos:7
+      image: almalinux:9
       imagePullPolicy: IfNotPresent
-      command: [ "/bin/sleep", "inf"]
-      volumeMounts:
-        - name: cvmfs
-          mountPath: /cvmfs
-          # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
-          mountPropagation: HostToContainer
-  volumes:
-    - name: cvmfs
-      persistentVolumeClaim:
-        claimName: cvmfs
-
-
+      command: [ "/bin/sleep", "inf"]
diff --git a/.ci/wn-with-cvmfs-xroot.yaml b/.ci/wn-with-cvmfs-xroot.yaml
@@ -5,17 +5,6 @@ metadata:
 spec:
   containers:
     - name: tester
-      image: centos:7
+      image: almalinux:9
       imagePullPolicy: IfNotPresent
       command: [ "/bin/sleep", "inf"]
-      volumeMounts:
-        - name: cvmfs
-          mountPath: /cvmfs
-          # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
-          mountPropagation: HostToContainer
-  volumes:
-    - name: cvmfs
-      persistentVolumeClaim:
-        claimName: cvmfs
-
-
diff --git a/.ci/wn-with-cvmfs.yaml b/.ci/wn-with-cvmfs.yaml
@@ -5,17 +5,7 @@ metadata:
 spec:
   containers:
     - name: tester
-      image: centos:7
+      image: almalinux:9
       imagePullPolicy: IfNotPresent
       command: [ "/bin/sleep", "inf"]
-      volumeMounts:
-        - name: cvmfs
-          mountPath: /cvmfs
-          # CVMFS automount volumes must be mounted with HostToContainer mount propagation.
-          mountPropagation: HostToContainer
-  volumes:
-    - name: cvmfs
-      persistentVolumeClaim:
-        claimName: cvmfs
-
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -421,12 +421,6 @@ Deploy 3rd party infrastructure services:
     - helm -n ${K8S_NAMESPACE} install ${HELM_OPTS} --wait cells bitnami/zookeeper
     - helm -n ${K8S_NAMESPACE} install ${HELM_OPTS} --wait --set externalZookeeper.servers=cells-zookeeper --set kraft.enabled=false billing bitnami/kafka --version 23.0.7
 
-Add CVMFS Volume:
-  stage: test_infra
-  extends: .kubernetes_image
-  script:
-    - kubectl -n $K8S_NAMESPACE apply -f .ci/cvmfs-volume-storageclass-pvc.yaml
-
 #
 # Start Current dCache version and an old pools
 #
@@ -445,26 +439,13 @@ Deploy dCache Helm Chart:
     - helm -n ${K8S_NAMESPACE} install ${HELM_OPTS} --wait --set image.tag=9.2.20 --set "dcache.pools={d,f}" --set dcache.door.enabled=false --set image.repository=${CI_REGISTRY_IMAGE} old-store dcache/dcache
 
 
-#
-# Grid tests expects cluster-wide cvmfs volumes to be present.
-#
-# The deployment can be done as:
-#
-#  kubectl create -f .ci/cvmfs-storageclass.yaml
-#  helm repo add cern https://registry.cern.ch/chartrepo/cern
-#  helm repo update
-#  helm -n dcache-dev-infrastructure install -f .ci/values-cvmfs.yaml cvmfs cern/cvmfs-csi
-#
-# More info: https://github.com/cvmfs-contrib/cvmfs-csi/tree/master/docs
-#
-Grid EL7 WN tests:
+Grid EL9 WN tests:
   stage: testing
   extends: .kubernetes_image
   script:
     - kubectl -n $K8S_NAMESPACE apply -f .ci/wn-with-cvmfs.yaml
     - while ! kubectl -n $K8S_NAMESPACE wait --for=condition=Ready pod grid-tester; do sleep 1; done
-    - kubectl -n $K8S_NAMESPACE exec grid-tester -- ls /cvmfs/grid.cern.ch/umd-c7wn-latest/etc/profile.d/setup-c7-wn-example.sh
-    - kubectl -n $K8S_NAMESPACE cp .ci/init-grid-ui.sh grid-tester:/init-grid-ui.sh
+    - kubectl -n $K8S_NAMESPACE cp .ci/init-el9-ui.sh grid-tester:/init-el9-ui.sh
     - kubectl -n $K8S_NAMESPACE cp .ci/run-grid-tests.sh grid-tester:/run-grid-tests.sh
     - kubectl -n $K8S_NAMESPACE exec grid-tester -- /bin/sh /run-grid-tests.sh
     - kubectl -n $K8S_NAMESPACE cp grid-tester:/xunit .
@@ -497,8 +478,7 @@ gsi_xroot_tests:
   script:
     - kubectl -n $K8S_NAMESPACE apply -f .ci/wn-with-cvmfs-xroot.yaml
     - while ! kubectl -n $K8S_NAMESPACE wait --for=condition=Ready pod xroot-tester; do sleep 1; done
-    - kubectl -n $K8S_NAMESPACE exec xroot-tester -- ls /cvmfs/grid.cern.ch/umd-c7wn-latest/etc/profile.d/setup-c7-wn-example.sh
-    - kubectl -n $K8S_NAMESPACE cp .ci/init-grid-ui.sh xroot-tester:/init-grid-ui.sh
+    - kubectl -n $K8S_NAMESPACE cp .ci/init-el9-ui.sh xroot-tester:/init-el9-ui.sh
     - kubectl -n $K8S_NAMESPACE cp .ci/run-xroot-tests.sh xroot-tester:/run-xroot-tests.sh
     - kubectl -n $K8S_NAMESPACE exec xroot-tester -- /bin/sh /run-xroot-tests.sh
 
@@ -508,8 +488,7 @@ webdav_with_x509_tests:
   script:
     - kubectl -n $K8S_NAMESPACE apply -f .ci/webdav-wn-cvmfs.yaml
     - while ! kubectl -n $K8S_NAMESPACE wait --for=condition=Ready pod webdav-tester; do sleep 1; done
-    - kubectl -n $K8S_NAMESPACE exec webdav-tester -- ls /cvmfs/grid.cern.ch/umd-c7wn-latest/etc/profile.d/setup-c7-wn-example.sh
-    - kubectl -n $K8S_NAMESPACE cp .ci/init-grid-ui.sh webdav-tester:/init-grid-ui.sh
+    - kubectl -n $K8S_NAMESPACE cp .ci/init-el9-ui.sh webdav-tester:/init-el9-ui.sh
     - kubectl -n $K8S_NAMESPACE cp .ci/run-webdav-tests.sh webdav-tester:/run-webdav-tests.sh
     - kubectl -n $K8S_NAMESPACE exec webdav-tester -- /bin/sh /run-webdav-tests.sh