ci: Update fedora image for cerbero trigger

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/931>
This commit is contained in:
Xavier Claessens 2021-10-04 20:24:58 -04:00 committed by Jordan Petridis
parent cf912f6d15
commit 275c540984
3 changed files with 10 additions and 11 deletions

View file

@ -24,7 +24,7 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough # If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want. # to change any part of the string of the image you want.
### ###
FEDORA_TAG: '2021-10-04.0' FEDORA_TAG: '2021-10-05.0'
INDENT_TAG: '2021-10-04.0' INDENT_TAG: '2021-10-04.0'
WINDOWS_TAG: "2021-10-04.1" WINDOWS_TAG: "2021-10-04.1"
@ -760,17 +760,14 @@ build documentation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/341737 # https://gitlab.com/gitlab-org/gitlab/-/issues/341737
cerbero trigger: cerbero trigger:
stage: build stage: build
image: $FEDORA_IMAGE extends:
- '.fedora image'
- '.fdo.suffixed-image@fedora'
needs: needs:
- "fedora amd64 docker" - "fedora amd64 docker"
script: script:
- python3 -m pip install --user python-gitlab
- ci/gitlab/trigger_cerbero_pipeline.py - ci/gitlab/trigger_cerbero_pipeline.py
variables:
# Use GST_UPSTREAM_BRANCH
UPSTREAM_BRANCH: 'main'
rules: rules:
- changes: - changes:
- .gitlab-ci.yml - .gitlab-ci.yml

View file

@ -202,7 +202,8 @@ dnf builddep -y gstreamer1 \
python3-gstreamer1 python3-gstreamer1
dnf remove -y meson dnf remove -y meson
pip3 install meson==0.59.1 hotdoc pip3 install meson==0.59.1 hotdoc python-gitlab
# Remove gst-devel packages installed by builddep above # Remove gst-devel packages installed by builddep above
dnf remove -y "gstreamer1*devel" dnf remove -y "gstreamer1*devel"

View file

@ -7,6 +7,7 @@ import gitlab
CERBERO_ID = 1340 CERBERO_ID = 1340
class Status: class Status:
FAILED = 'failed' FAILED = 'failed'
MANUAL = 'manual' MANUAL = 'manual'
@ -30,6 +31,7 @@ def fprint(msg):
print(msg, end="") print(msg, end="")
sys.stdout.flush() sys.stdout.flush()
if __name__ == "__main__": if __name__ == "__main__":
gl = gitlab.Gitlab( gl = gitlab.Gitlab(
"https://gitlab.freedesktop.org/", "https://gitlab.freedesktop.org/",
@ -40,7 +42,7 @@ if __name__ == "__main__":
cerbero = gl.projects.get(CERBERO_ID) cerbero = gl.projects.get(CERBERO_ID)
pipe = cerbero.trigger_pipeline( pipe = cerbero.trigger_pipeline(
token=os.environ['CI_JOB_TOKEN'], token=os.environ['CI_JOB_TOKEN'],
ref=os.environ["UPSTREAM_BRANCH"], ref=os.environ["GST_UPSTREAM_BRANCH"],
variables={ variables={
"CI_GSTREAMER_URL": os.environ["CI_PROJECT_URL"], "CI_GSTREAMER_URL": os.environ["CI_PROJECT_URL"],
"CI_GSTREAMER_REF_NAME": os.environ["CI_COMMIT_REF_NAME"], "CI_GSTREAMER_REF_NAME": os.environ["CI_COMMIT_REF_NAME"],
@ -56,4 +58,3 @@ if __name__ == "__main__":
sys.exit(0 if pipe.status == Status.SUCCESS else 1) sys.exit(0 if pipe.status == Status.SUCCESS else 1)
else: else:
fprint(".") fprint(".")