summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2023-03-30 08:07:11 -0400
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2023-03-31 15:15:55 +0000
commit17d1e5d6275ff7e5e0b4859a3c200efccca1bb0c (patch)
tree458eeff6f9f89f31be4dda1897f7f2098da55b68 /ci
parent8cf21fe7444e89baa73b2edbdfb1e63bcedac112 (diff)
downloadgstreamer-17d1e5d6275ff7e5e0b4859a3c200efccca1bb0c.tar.gz
ci: Propagate MESON_COMMIT to cerbero pipeline
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4305>
Diffstat (limited to 'ci')
-rwxr-xr-xci/gitlab/trigger_cerbero_pipeline.py25
1 files changed, 17 insertions, 8 deletions
diff --git a/ci/gitlab/trigger_cerbero_pipeline.py b/ci/gitlab/trigger_cerbero_pipeline.py
index 303fa098af..6390fa30ef 100755
--- a/ci/gitlab/trigger_cerbero_pipeline.py
+++ b/ci/gitlab/trigger_cerbero_pipeline.py
@@ -75,17 +75,26 @@ if __name__ == "__main__":
project_url = os.environ['CI_PROJECT_URL']
project_branch = os.environ['CI_COMMIT_REF_NAME']
+ variables = {
+ "CI_GSTREAMER_URL": project_url,
+ "CI_GSTREAMER_REF_NAME": project_branch,
+ # This tells cerbero CI that this is a pipeline started via the
+ # trigger API, which means it can use a deps cache instead of
+ # building from scratch.
+ "CI_GSTREAMER_TRIGGERED": "true",
+ }
+
+ meson_commit = os.environ.get('MESON_COMMIT')
+ if meson_commit:
+ # Propagate the Meson commit to cerbero pipeline and make sure it's not
+ # using deps cache.
+ variables['MESON_COMMIT'] = meson_commit
+ del variables['CI_GSTREAMER_TRIGGERED']
+
pipe = cerbero.trigger_pipeline(
token=os.environ['CI_JOB_TOKEN'],
ref=cerbero_branch,
- variables={
- "CI_GSTREAMER_URL": project_url,
- "CI_GSTREAMER_REF_NAME": project_branch,
- # This tells cerbero CI that this is a pipeline started via the
- # trigger API, which means it can use a deps cache instead of
- # building from scratch.
- "CI_GSTREAMER_TRIGGERED": "true",
- }
+ variables=variables,
)
fprint(f'Cerbero pipeline running at {pipe.web_url} ')