diff options
author | Jordan Petridis <jordan@centricular.com> | 2024-04-04 21:50:18 +0300 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-04-05 09:15:10 +0000 |
commit | 4a5c656d0095854ef63cbbc659977d55482ae2b2 (patch) | |
tree | 31d59dbc7faa15392171fe5547245ca5f2917d2d /.gitlab-ci.yml | |
parent | d4efceb95054ba38e0c1c214cd2021b142956898 (diff) |
ci: Move image tags to their own file
Have them grouped into their own file so it's easier
to update and then use the named variables.
This is the same way we do it in the monorepo as well.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1442>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c331070..355815d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,13 @@ include: - project: 'freedesktop/ci-templates' ref: 'master' file: '/templates/ubuntu.yml' + ### + # IMPORTANT + # These are the version tags for the docker images the CI runs against. + # 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. + ### + - local: '.gitlab-image-tags.yml' stages: - 'build docker' @@ -19,7 +26,6 @@ variables: CI_GSTREAMER_URL: 'https://gitlab.freedesktop.org/gstreamer/gstreamer.git' CI_GSTREAMER_TRIGGERED: 'false' GST_UPSTREAM_BRANCH: 'main' - WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-07-14.0-main' DEFAULT_CERBERO_ARGS: > --variants werror --clocktime @@ -58,13 +64,7 @@ default: .fedora image: variables: - ### - # IMPORTANT - # These are the version tags for the docker images the CI runs against. - # 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. - ### - FDO_DISTRIBUTION_TAG: '2023-06-08.0' + FDO_DISTRIBUTION_TAG: "$FEDORA_TAG" FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_PACKAGES: "sudo git-core lbzip2 rsync wine which python3-distro python3-distro-info" FDO_DISTRIBUTION_EXEC: ci/docker_setup.sh @@ -72,13 +72,7 @@ default: .checks fedora image: variables: - ### - # IMPORTANT - # These are the version tags for the docker images the CI runs against. - # 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. - ### - FDO_DISTRIBUTION_TAG: '2023-01-12.0' + FDO_DISTRIBUTION_TAG: "$CHECKS_FEDORA_TAG" FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_PACKAGES: "git-core python3-pip" FDO_DISTRIBUTION_EXEC: ci/checks_setup.sh @@ -87,13 +81,7 @@ default: .android fedora image: variables: - ### - # IMPORTANT - # These are the version tags for the docker images the CI runs against. - # 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. - ### - FDO_DISTRIBUTION_TAG: '2023-05-31.0' + FDO_DISTRIBUTION_TAG: "$ANDROID_FEDORA_TAG" FDO_DISTRIBUTION_VERSION: '37' FDO_DISTRIBUTION_PACKAGES: "file git-core java-11-openjdk-devel lbzip2 python3-distro python3-distro-info make pkg-config unzip which xz" FDO_DISTRIBUTION_EXEC: ci/docker_android_setup.sh $ANDROID_HOME $ANDROID_NDK_HOME $GST_UPSTREAM_BRANCH @@ -104,13 +92,7 @@ default: .ubuntu image: variables: - ### - # IMPORTANT - # These are the version tags for the docker images the CI runs against. - # 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. - ### - FDO_DISTRIBUTION_TAG: "2024-04-03.1" + FDO_DISTRIBUTION_TAG: "$UBUNTU_TAG" FDO_DISTRIBUTION_VERSION: "22.04" FDO_DISTRIBUTION_PACKAGES: >- bash |