From d4296b7d3def1f42baed35f67a6da0dc26d0b5d5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 5 Oct 2021 11:20:32 -0400 Subject: [PATCH] trigger_cerbero_pipeline.py: Do not hardcode gitlab instance When GStreamer is forked into a private GitLab instance we should trigger cerbero into that private instance too. Otherwise the token won't be accepted. Also do not hardcode the cerbero project ID because it is instance specific. Part-of: --- ci/gitlab/trigger_cerbero_pipeline.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/gitlab/trigger_cerbero_pipeline.py b/ci/gitlab/trigger_cerbero_pipeline.py index 74a1f61739..87a968fa93 100755 --- a/ci/gitlab/trigger_cerbero_pipeline.py +++ b/ci/gitlab/trigger_cerbero_pipeline.py @@ -5,7 +5,8 @@ import os import sys import gitlab -CERBERO_ID = 1340 +CERBERO_PROJECT = 'gstreamer/cerbero' + class Status: @@ -33,13 +34,12 @@ def fprint(msg): if __name__ == "__main__": - gl = gitlab.Gitlab( - "https://gitlab.freedesktop.org/", + server = os.environ['CI_SERVER_URL'] + gl = gitlab.Gitlab(server, private_token=os.environ.get('GITLAB_API_TOKEN'), - job_token=os.environ.get('CI_JOB_TOKEN') - ) + job_token=os.environ.get('CI_JOB_TOKEN')) - cerbero = gl.projects.get(CERBERO_ID) + cerbero = gl.projects.get(CERBERO_PROJECT) pipe = cerbero.trigger_pipeline( token=os.environ['CI_JOB_TOKEN'], ref=os.environ["GST_UPSTREAM_BRANCH"],