fix: do not do pilot tests if there's no pilot

DIRACGrid · Mar 6, 2025 · 0eed77a · 0eed77a
1 parent e7823c6
commit 0eed77a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml
@@ -5,8 +5,6 @@ volumes:
   diracx-cs-store:
   # Volume used to store the pair of keys to sign the tokens
   diracx-key-store:
-  # Volume used to store the certificates of dirac
-  certs_data:
   # Volume used to store the jwks of the IAM service
   diracx-iam-key-store:
 
@@ -113,15 +111,6 @@ services:
       /entrypoint.sh
     pull_policy: always
 
-  dirac-init-certificates:
-    image: ghcr.io/diracgrid/management/certificates-generation:latest
-    container_name: dirac-init-certificates
-    volumes:
-      - certs_data:/ca/certs/
-    entrypoint: |
-      /entrypoint.sh
-    pull_policy: always
-
   dirac-server:
     image: ${CI_REGISTRY_IMAGE}/${HOST_OS}-dirac
     container_name: server
@@ -149,7 +138,6 @@ services:
       - certs_data:/ca/certs
       - diracx-cs-store:/cs_store
       - diracx-key-store:/signing-key
-      - certs_data:/ca/certs
     environment:
       - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
       - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
@@ -168,8 +156,6 @@ services:
       - certs_data:/ca/certs
     ulimits:
       nofile: 8192
-    volumes:
-      - certs_data:/ca/certs
     command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
     pull_policy: always
 

diff --git a/tests/CI/install_client.sh b/tests/CI/install_client.sh
@@ -59,29 +59,31 @@ echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"
 
 installDIRAC
 
-echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
-dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt
+if [[ -z "${INSTALLATION_BRANCH}" ]]; then
+    echo -e "*** $(date -u)  Getting a non privileged user\n" |& tee -a clientTestOutputs.txt
+    dirac-proxy-init "${DEBUG}" |& tee -a clientTestOutputs.txt
 
-#-------------------------------------------------------------------------------#
-echo -e "*** $(date -u) **** Submit a job ****\n"
+    #-------------------------------------------------------------------------------#
+    echo -e "*** $(date -u) **** Submit a job ****\n"
 
-echo -e '[\n    Arguments = "Hello World";\n    Executable = "echo";\n    Site = "DIRAC.Jenkins.ch";' > test.jdl
-echo "    JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl
-echo "]" >> test.jdl
-dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
+    echo -e '[\n    Arguments = "Hello World";\n    Executable = "echo";\n    Site = "DIRAC.Jenkins.ch";' > test.jdl
+    echo "    JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test.jdl
+    echo "]" >> test.jdl
+    dirac-wms-job-submit test.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
 
-#-------------------------------------------------------------------------------#
-echo -e "*** $(date -u) **** add a file ****\n"
+    #-------------------------------------------------------------------------------#
+    echo -e "*** $(date -u) **** add a file ****\n"
 
-echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn
-base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}"
-dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT
-echo $?
+    echo "${CLIENT_UPLOAD_BASE64}" > b64_lfn
+    base64 b64_lfn --decode > "${CLIENT_UPLOAD_FILE}"
+    dirac-dms-add-file "${CLIENT_UPLOAD_LFN}" "${CLIENT_UPLOAD_FILE}" S3-DIRECT
+    echo $?
 
-#-------------------------------------------------------------------------------#
-echo -e "*** $(date -u) **** Submit a job with an input ****\n"
+    #-------------------------------------------------------------------------------#
+    echo -e "*** $(date -u) **** Submit a job with an input ****\n"
 
-echo -e '[\n    Arguments = "Hello World";\n    Executable = "echo";\n    Site = "DIRAC.Jenkins.ch";\n    InputData = "/vo/test_lfn.txt";' > test_dl.jdl
-echo "    JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl
-echo "]" >> test_dl.jdl
-dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
+    echo -e '[\n    Arguments = "Hello World";\n    Executable = "echo";\n    Site = "DIRAC.Jenkins.ch";\n    InputData = "/vo/test_lfn.txt";' > test_dl.jdl
+    echo "    JobName = \"${GITHUB_JOB}_$(date +"%Y-%m-%d_%T" | sed 's/://g')\"" >> test_dl.jdl
+    echo "]" >> test_dl.jdl
+    dirac-wms-job-submit test_dl.jdl "${DEBUG}" |& tee -a clientTestOutputs.txt
+fi
diff --git a/tests/CI/run_tests.sh b/tests/CI/run_tests.sh
@@ -52,7 +52,7 @@ elif [[ "$INSTALLTYPE" == "client" ]]; then
 
 elif [[ "$INSTALLTYPE" == "pilot" ]]; then
     # shellcheck source=/dev/null
-    source "$WORKSPACE/PilotInstallDIR/bashrc"
+    source "$WORKSPACE/bashrc"
     # If not unset, assert will not trigger
     unset PYTHONOPTIMIZE
     set -o pipefail