diff options
| author | Christian Gmeiner <[email protected]> | 2020-06-07 23:19:50 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-09 06:29:30 +0000 |
| commit | 839bc2daa93f88becb0494c8b1564bf40350a162 (patch) | |
| tree | 96555bd96043e21e6f8220ca737f254883c12bcb /.gitlab-ci.yml | |
| parent | 408b36a11dfe0bf3cbfda114c058ce7682b90483 (diff) | |
ci: use separate docker images for baremetal builds
Using arm_test-base as a separate base layer as well for storage &
network bandwidth efficiency.
Signed-off-by: Christian Gmeiner <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5381>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a57ddfe80a..00f5516d2ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -274,7 +274,7 @@ arm_test-base: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-07" + FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-08" .use-arm_test-base: extends: @@ -287,19 +287,19 @@ arm_test-base: needs: - arm_test-base -# x86 image with ARM rootfses for baremetal testing. -arm_test: +# x86 image with ARM64 rootfs for baremetal testing. +arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm_test "2020-06-07" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-08" -.use-arm_test: +.use-arm64_test: variables: - TAG: *arm_test - image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" + TAG: *arm64_test + image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG" needs: - - arm_test + - arm64_test # Native Windows docker builds # @@ -945,7 +945,7 @@ arm64_a630_gmem: arm64_a306_gles2: extends: - .baremetal-test - - .use-arm_test + - .use-arm64_test - .freedreno-rules variables: BM_KERNEL: /lava-files/Image.gz @@ -964,7 +964,7 @@ arm64_a306_gles2: script: - .gitlab-ci/bare-metal/fastboot.sh needs: - - arm_test + - arm64_test - arm_build - meson-arm64 tags: |