From b89963f4a1f01ae4bd4935c3cdc146d1067d8a21 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Sun, 29 Aug 2021 11:53:27 +0200
Subject: [PATCH] gitlab-ci: Fix triggering updates when auth is required
When retrieving an artifacts from a past job with a job token, the
`JOB-TOKEN``header should be used rather than the `PRIVATE-HEADER` and
the API URL should be used rather than the enduser route.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c06fe85..94cf699 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,7 +227,9 @@ trigger-updates:
if [ -n "$TRIGGER_FROM_JOB" ]
then
echo "Retrieving updatable packages from job $TRIGGER_FROM_JOB"
- wget --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "$CI_PROJECT_URL/-/jobs/$TRIGGER_FROM_JOB/artifacts/raw/packaging-updates.yaml"
+ JOB_ID=${TRIGGER_FROM_JOB##*/}
+ JOB_API_URL=$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$JOB_ID/
+ wget --header "JOB-TOKEN: $CI_JOB_TOKEN" "$JOB_API_URL/artifacts/packaging-updates.yaml"
fi
- |
if [ -z "$TRIGGER_UPDATES" ]
--
GitLab