From c7ff282f80f53ddfb4b935add2dd5cacc65dfb5e Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Wed, 12 Feb 2025 14:51:56 +0100 Subject: [PATCH] Allow specifying vaccine ref to use in GitLab --- .gitlab-ci.yml | 2 +- .gitlab/scripts/vaccine.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aef04cb085f..d193675ef31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,4 +180,4 @@ vaccine: stage: vaccine needs: [create-multiarch-lib-injection-image] script: | - .gitlab/scripts/vaccine.sh + .gitlab/scripts/vaccine.sh master diff --git a/.gitlab/scripts/vaccine.sh b/.gitlab/scripts/vaccine.sh index 07007e1a877..9643e8cb74c 100755 --- a/.gitlab/scripts/vaccine.sh +++ b/.gitlab/scripts/vaccine.sh @@ -6,6 +6,8 @@ GH_VACCINE_PAT=$(vault kv get -field=vaccine-token kv/k8s/gitlab-runner/dd-trace REPO="Datadog/vaccine" POLL_INTERVAL=60 # seconds +REF="${1:-master}" + # Trigger workflow echo "Triggering workflow..." TRIGGER_RESPONSE=$(curl -X POST \ @@ -13,7 +15,7 @@ TRIGGER_RESPONSE=$(curl -X POST \ -H "Authorization: token $GH_VACCINE_PAT" \ -w "\n%{http_code}" \ "https://api.github.com/repos/$REPO/actions/workflows/vaccine.yml/dispatches" \ - -d '{"ref":"master", "inputs": {"commit_sha": "'$CI_COMMIT_SHA'"}}' 2>&1) + -d '{"ref":"'${REF}'", "inputs": {"commit_sha": "'$CI_COMMIT_SHA'"}}' 2>&1) HTTP_STATUS=$(echo "$TRIGGER_RESPONSE" | tail -n1) if [ "$HTTP_STATUS" -ne 204 ]; then