Skip to content

Commit d407be2

Browse files
Pablo Oliver Cortésesindril
authored andcommitted
CI: Update notify_cta_project job
1 parent 2699b6b commit d407be2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.gitlab-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -867,15 +867,15 @@ notify_cta_project:
867867
EOS_IMAGE_TAG="$CI_COMMIT_SHORT_SHA.el9";
868868
else
869869
EOS_IMAGE_TAG="$CI_COMMIT_TAG.el9";
870-
EOS_VERSION="$CI_COMMIT_TAG";
870+
EOS_VERSION=$(dnf -q --repofrompath=temprepo,https://storage-ci.web.cern.ch/storage-ci/eos/diopside/tag/testing/el-9/x86_64/ --repo=temprepo repoquery --qf "%{version}-%{release}\n" eos-client | grep "${CI_COMMIT_TAG}" | tail -1);
871+
if [[ -z ${EOS_VERSION} ]]; then
872+
echo "ERROR: Could not find EOS RPMs for ${CI_COMMIT_TAG} in storage-ci.web.cern.ch/storage-ci/eos/diopside/tag/testing/el-9/x86_64/"
873+
exit 1
874+
fi
871875
fi
872876
# Extract XRootD version from eos.spec.in
873-
- XROOTD_VERSION=$(grep '^%define xrootd_version_min' eos.spec.in | awk '{print $3}')
874-
# The locked XRootD version does not have the release included, while this is necessary to versionlock it correctly in the CTA pipeline
875-
- |
876-
if [[ "$XROOTD_VERSION" != *-* ]]; then
877-
XROOTD_VERSION="${XROOTD_VERSION}-1"
878-
fi
877+
- xrd_min=$(grep '^%define xrootd_version_min' eos.spec.in | awk '{print $3}')
878+
- XROOTD_VERSION=$(dnf -q --repofrompath=temprepo,https://xrootd.web.cern.ch/repo/testing/el9/x86_64/ --repo=temprepo repoquery --qf "%{epoch}:%{version}-%{release}\n" xrootd | grep "${xrd_min}" | tail -1)
879879
# Get the latest stable CTA version
880880
- 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)
881881
# Against an existing CTA tag, we can only trigger a pipeline where a different EOS image is used

0 commit comments

Comments
 (0)