CI: Update gitlab CTA trigger job to use new CTA pipeline setup

Author: BugelNiels

.gitlab-ci.yml

@@ -850,46 +850,72 @@ email_notification:
 notify_cta_project:
   stage: publish
   image: gitlab-registry.cern.ch/linuxsupport/alma9-base
+  needs:
+    - job: el9_docker_image
+      artifacts: false
+  variables:
+    CTA_BRANCH: main
   script:
+    - dnf install --nogpg -y curl gawk jq
+    - CTA_PROJECT_ID="139306"
+    - CTA_PROJECT_API="https://gitlab.cern.ch/api/v4/projects/$CTA_PROJECT_ID"
+    - TRIGGER_URL="$CTA_PROJECT_API/trigger/pipeline"
+    # Construct EOS versions
     - |
-      dnf install --nogpg -y git curl gawk jq
-      # Variables
-      EOS_TAG_NAME=$(git describe --tags --exact-match || echo "not-a-tag")
-      CTA_PROJECT_ID="139306"
-      CTA_PROJECT_API="https://gitlab.cern.ch/api/v4/projects/$CTA_PROJECT_ID"
-      TRIGGER_URL="$CTA_PROJECT_API/trigger/pipeline"
-
-      # Extract versions from eos.spec.in
-      XROOTD_VERSION=$(grep '^%define xrootd_version_min' eos.spec.in | awk '{print $3}')
-
-      # Fetch the latest tag from the CTA project
-      LATEST_CTA_TAG=$(curl --silent "$CTA_PROJECT_API/repository/tags?order_by=updated&sort=desc" | jq -r '.[0].name')
-      echo "Latest tag from the CTA project: $LATEST_CTA_TAG"
-
-      if [ "$EOS_TAG_NAME" != "not-a-tag" ]; then
-       # Trigger the external CTA pipeline using the latest CTA and EOS tags
-       curl -X POST \
-         -F token=$CTA_TRIGGER_TOKEN \
-         -F ref=main \
-         -F "variables[CUSTOM_EOS_TAG]=$EOS_TAG_NAME" \
-         -F "variables[CUSTOM_XRD_TAG]=$XROOTD_VERSION" \
-         -F "variables[CUSTOM_CTA_TAG]=$LATEST_CTA_TAG" \
-         -F "variables[PIPELINE_TYPE]=EOS_REGR_AGAINST_CTA_TAG" \
-         $TRIGGER_URL
-
-       # Trigger the external CTA pipeline using the latest EOS tag a
-       # and latest CTA commit to main
-       curl -X POST \
-         -F token=$CTA_TRIGGER_TOKEN \
-         -F ref=main \
-         -F "variables[CUSTOM_EOS_TAG]=$EOS_TAG_NAME" \
-         -F "variables[CUSTOM_XRD_TAG]=$XROOTD_VERSION" \
-         -F "variables[PIPELINE_TYPE]=EOS_REGR_AGAINST_CTA_MAIN" \
-         $TRIGGER_URL
+      if [[ -z "$CI_COMMIT_TAG" ]]; then
+        EOS_IMAGE_TAG="$CI_COMMIT_SHORT_SHA.el9";
+      else
+        EOS_IMAGE_TAG="$CI_COMMIT_TAG.el9";
+        EOS_VERSION="$CI_COMMIT_TAG";
       fi
-  when: manual
-  #only:
-  #  - tags
+    # Extract XRootD version from eos.spec.in
+    - XROOTD_VERSION=$(grep '^%define xrootd_version_min' eos.spec.in | awk '{print $3}')
+    # The locked XRootD version does not have the release included, while this is necessary to versionlock it correctly in the CTA pipeline
+    - |
+      if [[ "$XROOTD_VERSION" != *-* ]]; then
+        XROOTD_VERSION="${XROOTD_VERSION}-1"
+      fi
+    # Get the latest stable CTA version
+    - LATEST_CTA_VERSION=$(dnf -q --repofrompath=temprepo,https://cta-public-repo.web.cern.ch/stable/cta-5/el9/cta/x86_64/ --repo=temprepo repoquery --latest-limit=1 --qf "%{version}-%{release}" cta-taped)
+    # Against an existing CTA tag, we can only trigger a pipeline where a different EOS image is used
+    - echo "Triggering pipeline against CTA version $LATEST_CTA_VERSION with EOS image tag $EOS_IMAGE_TAG"
+    - curl -X POST
+          -F token=$CTA_TRIGGER_TOKEN
+          -F ref=$CTA_BRANCH
+          -F "variables[CUSTOM_EOS_IMAGE_TAG]=$EOS_IMAGE_TAG"
+          -F "variables[CUSTOM_CTA_VERSION]=$LATEST_CTA_VERSION"
+          -F "variables[PIPELINE_TYPE]=REGR_AGAINST_CTA_VERSION"
+          $TRIGGER_URL
+    # Against the CTA main branch, we can also test the client EOS and XRootD versions if we are on a (EOS) tag
+    # If we are not on a (EOS) tag, the EOS RPMs are not accessible by the CTA pipeline, so we only test against the image
+    - |
+      if [[ -z "$CI_COMMIT_TAG" ]]; then
+        echo "Triggering pipeline against CTA main branch"
+        echo "Using EOS image tag $EOS_IMAGE_TAG and XRootD version $XROOTD_VERSION"
+        curl -X POST \
+            -F token=$CTA_TRIGGER_TOKEN \
+            -F ref=$CTA_BRANCH \
+            -F "variables[CUSTOM_EOS_IMAGE_TAG]=$EOS_IMAGE_TAG" \
+            -F "variables[CUSTOM_XROOTD_VERSION]=$XROOTD_VERSION" \
+            -F "variables[PIPELINE_TYPE]=REGR_AGAINST_CTA_MAIN" \
+            $TRIGGER_URL
+      else
+        echo "Triggering pipeline against CTA main branch"
+        echo "Using EOS image tag $EOS_IMAGE_TAG, EOS client version $EOS_VERSION and XRootD version $XROOTD_VERSION"
+        curl -X POST \
+            -F token=$CTA_TRIGGER_TOKEN \
+            -F ref=$CTA_BRANCH \
+            -F "variables[CUSTOM_EOS_IMAGE_TAG]=$EOS_IMAGE_TAG" \
+            -F "variables[CUSTOM_EOS_VERSION]=$EOS_VERSION" \
+            -F "variables[CUSTOM_XROOTD_VERSION]=$XROOTD_VERSION" \
+            -F "variables[PIPELINE_TYPE]=REGR_AGAINST_CTA_MAIN" \
+            $TRIGGER_URL
+      fi
+  rules:
+    - if: '$CI_COMMIT_TAG'
+      when: on_success
+    - when: manual
+      allow_failure: true
 
 rpm_commit_artifacts:
   stage: publish