diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-11-13 17:43:41 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-11-15 16:20:16 +0100 |
| commit | 3a48f4565e4fd00b35144dc785ca0d38220cff3d (patch) | |
| tree | 61d2ab05633e634a5d75fc0de66067f7f00faede /.gitlab-ci | |
| parent | 670277846dcf6ed3e80c0c6037a23c4d34ff558d (diff) | |
| download | mesa-3a48f4565e4fd00b35144dc785ca0d38220cff3d.tar.gz | |
gitlab-ci: Use functional container job names
This makes it easier to tell which job is which in a pipeline.
v2:
* Use lava_arm{64,hf} instead of arm{64,hf}_lava to keep these jobs
together in pipeline overviews
Reviewed-by: Eric Anholt <eric@anholt.net> # v1
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 342e7f07750..763b06d97ba 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -39,7 +39,7 @@ include: bash .gitlab-ci/lava-debian-install.sh' DEBIAN_VERSION: ${LAVA_DEBIAN_VERSION} -lava-container:armhf: +lava_armhf: extends: .lava-container variables: DEBIAN_ARCH: "armhf" @@ -50,7 +50,7 @@ lava-container:armhf: DEVICE_TREES: "arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb" KERNEL_IMAGE_NAME: "zImage" -lava-container:arm64: +lava_arm64: extends: .lava-container variables: DEBIAN_ARCH: "arm64" @@ -124,7 +124,7 @@ lava-container:arm64: lava-build:armhf: extends: .lava-build - needs: ["lava-container:armhf"] + needs: ["lava_armhf"] variables: DEBIAN_ARCH: "armhf" GCC_ARCH: "arm-linux-gnueabihf" @@ -133,7 +133,7 @@ lava-build:armhf: lava-build:arm64: extends: .lava-build - needs: ["lava-container:arm64"] + needs: ["lava_arm64"] variables: DEBIAN_ARCH: "arm64" GCC_ARCH: "aarch64-linux-gnu" @@ -163,7 +163,7 @@ lava-build:arm64: image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:armhf-$LAVA_IMAGE_TAG extends: .lava-test needs: - - lava-container:armhf + - lava_armhf - lava-build:armhf dependencies: - lava-build:armhf @@ -172,7 +172,7 @@ lava-build:arm64: image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:arm64-$LAVA_IMAGE_TAG extends: .lava-test needs: - - lava-container:arm64 + - lava_arm64 - lava-build:arm64 dependencies: - lava-build:arm64 |