diff options
| author | Michel Dänzer <[email protected]> | 2020-05-30 15:53:41 +0200 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2020-06-02 10:14:16 -0700 |
| commit | a85da8e3d5e430cf661f0343d00810923de2e379 (patch) | |
| tree | b2fd0df364507c2958588a04f63093ad71b4072f /.gitlab-ci.yml | |
| parent | ae400553fbb1a9ca2add87072f7dd61621e69111 (diff) | |
gitlab-ci: Add x86_build-base docker image
Similar to x86_test-base.
Reviewed-by: Eric Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0a6e4c4613..cf6b386f94f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,30 +131,49 @@ success: # no need to pull the whole repo to build the container image GIT_STRATEGY: none -# Debian 10 based x86 build image -x86_build: +# Debian 10 based x86 build image base +x86_build-base: extends: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-05-31" + FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-01" + +.use-x86_build-base: + extends: + - x86_build-base + - .ci-run-policy + stage: container-2 + variables: + BASE_TAG: *x86_build-base + FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/x86_build-base:$BASE_TAG" + needs: + - x86_build-base + +# Debian 10 based x86 main build image +x86_build: + extends: + - .use-x86_build-base + variables: + FDO_DISTRIBUTION_TAG: &x86_build "2020-06-01" .use-x86_build: variables: TAG: *x86_build image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG" needs: + - x86_build-base - x86_build # Debian 10 based x86 test image base x86_test-base: - extends: x86_build + extends: x86_build-base variables: FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02" .use-x86_test-base: extends: - - x86_build + - x86_build-base - .ci-run-policy stage: container-2 variables: @@ -177,7 +196,7 @@ x86_test-vk: # Debian 9 based x86 build image (old LLVM) x86_build_old: - extends: x86_build + extends: x86_build-base variables: FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-02" FDO_DISTRIBUTION_VERSION: stretch-slim @@ -206,7 +225,7 @@ arm_build: # x86 image with ARM rootfses for baremetal testing. arm_test: - extends: x86_build + extends: x86_build-base variables: FDO_DISTRIBUTION_TAG: &arm_test "2020-06-01" @@ -621,6 +640,7 @@ meson-mingw32-x86_64: TAG: *x86_test-gl image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG" needs: + - x86_build-base - x86_build - meson-testing - x86_test-base @@ -633,6 +653,7 @@ meson-mingw32-x86_64: TAG: *x86_test-vk image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG" needs: + - x86_build-base - x86_build - meson-testing - x86_test-base |