From 25db7bee14c8fe2be79232a8d0ebc1e8323cf24e Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Tue, 8 Apr 2025 19:04:58 -0700 Subject: [PATCH] drm_hwcomposer: CI: Move container tags to a file Currently the container image tags are defined as variables in the top level .gitlab-ci.yml. Move the tags to their own file so that more tags can be added without cluttering the top-level .gitlab-ci.yml. Signed-off-by: Deborah Brouwer --- .ci/image-tags.yml | 4 ++++ .gitlab-ci.yml | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .ci/image-tags.yml diff --git a/.ci/image-tags.yml b/.ci/image-tags.yml new file mode 100644 index 0000000..011dc19 --- /dev/null +++ b/.ci/image-tags.yml @@ -0,0 +1,4 @@ + +variables: + UBUNTU_HWC_IMAGE: "ubuntu/x86_64_hwc" + UBUNTU_HWC_TAG: "20250218_hwc" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d99352b..a38682a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,6 @@ variables: DEBIAN_FRONTEND: noninteractive CI_TEMPLATES_COMMIT: &ci-templates-commit ea3f77641d91765396beba192b8defd3085fa343 FDO_UPSTREAM_REPO: "drm-hwcomposer/drm-hwcomposer" - UBUNTU_HWC_IMAGE: "ubuntu/x86_64_hwc" - UBUNTU_HWC_TAG: "20250218_hwc" include: - project: 'freedesktop/ci-templates' @@ -16,6 +14,7 @@ include: file: - '/templates/ubuntu.yml' - local: '.ci/container/.gitlab-ci.yml' + - local: '.ci/image-tags.yml' stages: - container