Module: Mesa Branch: master Commit: 366fb28dacef2ef45702a9301b176190ac429e56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=366fb28dacef2ef45702a9301b176190ac429e56
Author: Michel Dänzer <[email protected]> Date: Tue Dec 15 18:02:04 2020 +0100 ci: Fix MESA_TEMPLATES_COMMIT value The intention was to set it to the commit used for debian.yml, but I accidentally set it to the ci-fairy.yml commit instead. v2: * While we're at it, put two dashes between the base tag and the ci-templates commit hash, making them easier to tell apart. v3: * While we're at it, fix the year of some recently bumped tags. Fixes: 48f78dfd1ac1 "ci: Define global variable MESA_TEMPLATES_COMMIT for ci-templates commit" Reviewed-by: Eric Anholt <[email protected]> # v2 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8690> --- .gitlab-ci.yml | 40 ++++++++++++++++++++-------------------- .gitlab-ci/lava-gitlab-ci.yml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0213791163..f3eddfbea8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: FDO_UPSTREAM_REPO: mesa/mesa - MESA_TEMPLATES_COMMIT: &ci-templates-commit 43ac932d5b8ebf43040d302de3c6e734df178384 + MESA_TEMPLATES_COMMIT: &ci-templates-commit 52dd4a94044449c8481d18dcdc221a3c636366d2 CI_PRE_CLONE_SCRIPT: |- set -o xtrace /usr/bin/wget -q -O- ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | sh - @@ -9,11 +9,11 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: *ci-templates-commit + ref: 43ac932d5b8ebf43040d302de3c6e734df178384 file: - '/templates/ci-fairy.yml' - project: 'freedesktop/ci-templates' - ref: 52dd4a94044449c8481d18dcdc221a3c636366d2 + ref: *ci-templates-commit file: - '/templates/debian.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' @@ -238,7 +238,7 @@ success: # Otherwise, container jobs won't run - when: never variables: - FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}-${MESA_TEMPLATES_COMMIT}" + FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}" FDO_DISTRIBUTION_VERSION: buster-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' @@ -252,7 +252,7 @@ success: - .ci-run-policy stage: container-2 variables: - FDO_BASE_IMAGE: "${CI_REGISTRY_IMAGE}/${MESA_BASE_IMAGE}:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}" + FDO_BASE_IMAGE: "${CI_REGISTRY_IMAGE}/${MESA_BASE_IMAGE}:${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}" # Debian 10 based x86 build image base x86_build-base: @@ -282,7 +282,7 @@ x86_build: .use-x86_build: variables: TAG: *x86_build - image: "$CI_REGISTRY_IMAGE/debian/x86_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/x86_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - x86_build @@ -296,7 +296,7 @@ i386_build: .use-i386_build: variables: TAG: *i386_build - image: "$CI_REGISTRY_IMAGE/debian/i386_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/i386_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - i386_build @@ -310,7 +310,7 @@ ppc64el_build: .use-ppc64el_build: variables: TAG: *ppc64el_build - image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - ppc64el_build @@ -324,7 +324,7 @@ s390x_build: .use-s390x_build: variables: TAG: *s390x_build - image: "$CI_REGISTRY_IMAGE/debian/s390x_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/s390x_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - s390x_build @@ -338,7 +338,7 @@ android_build: .use-android_build: variables: TAG: *android_build - image: "$CI_REGISTRY_IMAGE/debian/android_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/android_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - android_build @@ -346,7 +346,7 @@ android_build: x86_test-base: extends: x86_build-base variables: - MESA_IMAGE_TAG: &x86_test-base "2020-01-14-asan" + MESA_IMAGE_TAG: &x86_test-base "2021-01-14-asan" .use-x86_test-base: extends: @@ -362,13 +362,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2020-01-14-asan" + MESA_IMAGE_TAG: &x86_test-gl "2021-01-14-asan" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2020-01-14-asan" + MESA_IMAGE_TAG: &x86_test-vk "2021-01-14-asan" # Debian 10 based ARM build image arm_build: @@ -381,7 +381,7 @@ arm_build: .use-arm_build: variables: TAG: *arm_build - image: "$CI_REGISTRY_IMAGE/debian/arm_build:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/arm_build:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - arm_build @@ -413,7 +413,7 @@ arm64_test: .use-arm64_test: variables: TAG: *arm64_test - image: "$CI_REGISTRY_IMAGE/debian/arm64_test:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/arm64_test:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - arm64_test @@ -427,7 +427,7 @@ armhf_test: .use-armhf_test: variables: TAG: *armhf_test - image: "$CI_REGISTRY_IMAGE/debian/armhf_test:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/armhf_test:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - armhf_test @@ -446,8 +446,8 @@ armhf_test: .windows-docker-vs2019: variables: WINDOWS_TAG: "2021-01-29" - WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:${WINDOWS_TAG}-${MESA_TEMPLATES_COMMIT}" - WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${WINDOWS_TAG}-${MESA_TEMPLATES_COMMIT}" + WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:${WINDOWS_TAG}--${MESA_TEMPLATES_COMMIT}" + WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${WINDOWS_TAG}--${MESA_TEMPLATES_COMMIT}" windows_build_vs2019: extends: @@ -983,7 +983,7 @@ meson-mingw32-x86_64: - .test variables: TAG: *x86_test-gl - image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - x86_test-gl @@ -999,7 +999,7 @@ meson-mingw32-x86_64: - .test variables: TAG: *x86_test-vk - image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:${TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:${TAG}--${MESA_TEMPLATES_COMMIT}" needs: - meson-testing - x86_test-vk diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 09705623928..b73553223bf 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -19,7 +19,7 @@ kernel+rootfs_amd64: extends: - .use-x86_build-base - .kernel+rootfs - image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}-${MESA_TEMPLATES_COMMIT}" + image: "$CI_REGISTRY_IMAGE/debian/x86_build-base:${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}" variables: DEBIAN_ARCH: "amd64" _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
