Gitlab CI: Rework our tag usage again
Now that we've had jobs running on both amd64 and arm64 hosts for a while, we have enough data to look at usage and findings. For the world build job, make use of the new DEFAULT_FAST_TAG and only build it once, on either amd64 or arm64 as we don't run in to host specific results there. For sandbox, continue to build on both arm64 and amd64 hosts as we can find host specific breakage that way. Remove the mistaken restriction on sandbox64_lwip. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
+2
-16
@@ -2,10 +2,8 @@
|
||||
|
||||
variables:
|
||||
DEFAULT_ALL_TAG: "all"
|
||||
DEFAULT_ARM64_TAG: "arm64"
|
||||
DEFAULT_FAST_ARM64_TAG: "fast arm64"
|
||||
DEFAULT_AMD64_TAG: "amd64"
|
||||
DEFAULT_FAST_AMD64_TAG: "fast amd64"
|
||||
DEFAULT_FAST_TAG: "fast"
|
||||
MIRROR_DOCKER: docker.io
|
||||
SJG_LAB: ""
|
||||
PLATFORM: linux/amd64,linux/arm64
|
||||
@@ -144,12 +142,8 @@ stages:
|
||||
build all platforms in a single job:
|
||||
stage: world build
|
||||
dependencies: []
|
||||
parallel:
|
||||
matrix:
|
||||
- HOST: "fast arm64"
|
||||
- HOST: "fast amd64"
|
||||
tags:
|
||||
- ${HOST}
|
||||
- ${DEFAULT_FAST_TAG}
|
||||
script:
|
||||
# Prepare python environment
|
||||
- python3 -m venv /tmp/venv;
|
||||
@@ -319,12 +313,6 @@ sandbox64 with clang test.py:
|
||||
<<: *buildman_and_testpy_dfn
|
||||
|
||||
sandbox64_lwip test.py:
|
||||
parallel:
|
||||
matrix:
|
||||
- HOST: "arm64"
|
||||
- HOST: "amd64"
|
||||
tags:
|
||||
- ${HOST}
|
||||
variables:
|
||||
TEST_PY_BD: "sandbox64_lwip"
|
||||
<<: *buildman_and_testpy_dfn
|
||||
@@ -371,8 +359,6 @@ evb-ast2500 test.py:
|
||||
<<: *buildman_and_testpy_dfn
|
||||
|
||||
sandbox_flattree test.py:
|
||||
tags:
|
||||
- ${DEFAULT_AMD64_TAG}
|
||||
variables:
|
||||
TEST_PY_BD: "sandbox_flattree"
|
||||
<<: *buildman_and_testpy_dfn
|
||||
|
||||
Reference in New Issue
Block a user