ci: Update the ci-templates commit.

There has been a big rename of variables in the upstream repo to make it
clear what's being handed to ci-templates.

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4099>
This commit is contained in:
Eric Anholt
2020-03-06 13:23:20 -08:00
parent d60375cbc2
commit af7dca3560

View File

@@ -1,9 +1,9 @@
variables: variables:
UPSTREAM_REPO: mesa/mesa FDO_UPSTREAM_REPO: mesa/mesa
include: include:
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 ref: a1699326519fd28526485ce93464e33423bac564
file: '/templates/debian.yml' file: '/templates/debian.yml'
- local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml'
- local: '.gitlab-ci/test-source-dep.yml' - local: '.gitlab-ci/test-source-dep.yml'
@@ -88,7 +88,7 @@ success:
# Build the CI docker images. # Build the CI docker images.
# #
# DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the # FDO_DISTRIBUTION_TAG is the tag of the docker image used by later stage jobs. If the
# image doesn't exist yet, the container stage job generates it. # image doesn't exist yet, the container stage job generates it.
# #
# In order to generate a new image, one should generally change the tag. # In order to generate a new image, one should generally change the tag.
@@ -108,19 +108,19 @@ success:
extends: extends:
- .ci-run-policy - .ci-run-policy
variables: variables:
DEBIAN_VERSION: buster-slim FDO_DISTRIBUTION_VERSION: buster-slim
REPO_SUFFIX: $CI_JOB_NAME FDO_REPO_SUFFIX: $CI_JOB_NAME
DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image # no need to pull the whole repo to build the container image
GIT_STRATEGY: none GIT_STRATEGY: none
# Debian 10 based x86 build image # Debian 10 based x86 build image
x86_build: x86_build:
extends: extends:
- .debian@container-ifnot-exists - .fdo.container-ifnot-exists@debian
- .container - .container
variables: variables:
DEBIAN_TAG: &x86_build "2020-03-13" FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13"
.use-x86_build: .use-x86_build:
variables: variables:
@@ -133,20 +133,20 @@ x86_build:
x86_test-gl: x86_test-gl:
extends: x86_build extends: x86_build
variables: variables:
DEBIAN_TAG: &x86_test-gl "2020-03-13" FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-13"
# Debian 10 based x86 test image for VK # Debian 10 based x86 test image for VK
x86_test-vk: x86_test-vk:
extends: x86_build extends: x86_build
variables: variables:
DEBIAN_TAG: &x86_test-vk "2020-03-16" FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-16"
# Debian 9 based x86 build image (old LLVM) # Debian 9 based x86 build image (old LLVM)
x86_build_old: x86_build_old:
extends: x86_build extends: x86_build
variables: variables:
DEBIAN_TAG: &x86_build_old "2019-09-18" FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18"
DEBIAN_VERSION: stretch-slim FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old: .use-x86_build_old:
variables: variables:
@@ -158,10 +158,10 @@ x86_build_old:
# Debian 10 based ARM build image # Debian 10 based ARM build image
arm_build: arm_build:
extends: extends:
- .debian@container-ifnot-exists@arm64v8 - .fdo.container-ifnot-exists@debian@arm64v8
- .container - .container
variables: variables:
DEBIAN_TAG: &arm_build "2020-03-13" FDO_DISTRIBUTION_TAG: &arm_build "2020-03-13"
.use-arm_build: .use-arm_build:
variables: variables:
@@ -174,7 +174,7 @@ arm_build:
arm_test: arm_test:
extends: arm_build extends: arm_build
variables: variables:
DEBIAN_TAG: &arm_test "2020-01-30" FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30"
.use-arm_test: .use-arm_test:
variables: variables: