Mesa (master): gitlab-ci: Use functional container job names
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Nov 15 16:00:22 UTC 2019
Module: Mesa
Branch: master
Commit: 3a48f4565e4fd00b35144dc785ca0d38220cff3d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a48f4565e4fd00b35144dc785ca0d38220cff3d
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Wed Nov 13 17:43:41 2019 +0100
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 at anholt.net> # v1
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
---
.gitlab-ci.yml | 36 ++++++++++++++++++------------------
.gitlab-ci/lava-gitlab-ci.yml | 12 ++++++------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11189135e6d..73b56a388be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,38 +92,38 @@ stages:
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
-debian-10:amd64:
+x86_build:
extends:
- .debian at container-ifnot-exists
- .container
variables:
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
-.use-debian-10:amd64:
+.use-x86_build:
image: $DEBIAN_IMAGE
needs:
- - debian-10:amd64
+ - x86_build
-debian-10-test:amd64:
- extends: debian-10:amd64
+x86_test:
+ extends: x86_build
variables:
DEBIAN_TAG: "$DEBIAN_TEST_TAG"
DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
-debian-9:amd64:
- extends: debian-10:amd64
+x86_build_old:
+ extends: x86_build
variables:
DEBIAN_TAG: $STRETCH_TAG
DEBIAN_VERSION: $STRETCH_VERSION
DEBIAN_IMAGE: $STRETCH_IMAGE
DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
-.use-debian-9:amd64:
+.use-x86_build_old:
image: $STRETCH_IMAGE
needs:
- - debian-9:amd64
+ - x86_build_old
-debian-10:arm64:
+arm_build:
extends:
- .debian at container-ifnot-exists@arm64v8
- .container
@@ -131,7 +131,7 @@ debian-10:arm64:
DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh'
-debian-10-test:arm64:
+arm_test:
extends:
- .debian at container-ifnot-exists@arm64v8
- .container
@@ -187,14 +187,14 @@ debian-10-test:arm64:
.meson-build:
extends:
- .build-linux
- - .use-debian-10:amd64
+ - .use-x86_build
script:
- .gitlab-ci/meson-build.sh
.scons-build:
extends:
- .build-linux
- - .use-debian-10:amd64
+ - .use-x86_build
variables:
SCONSFLAGS: "-j4"
script:
@@ -262,7 +262,7 @@ meson-main:
EXTRA_OPTION: >
-D I-love-half-baked-turnips=true
needs:
- - debian-10:arm64
+ - arm_build
tags:
- aarch64
@@ -368,7 +368,7 @@ meson-clover:
meson-clover-old-llvm:
extends:
- meson-clover
- - .use-debian-9:amd64
+ - .use-x86_build_old
variables:
UNWIND: "false"
DRI_LOADERS: >
@@ -450,7 +450,7 @@ scons:
scons-old-llvm:
extends:
- scons
- - .use-debian-9:amd64
+ - .use-x86_build_old
script:
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
- LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
@@ -477,7 +477,7 @@ scons-old-llvm:
- meson-main
needs:
- meson-main
- - debian-10-test:amd64
+ - x86_test
.piglit-test:
extends: .test
@@ -567,7 +567,7 @@ arm64_a630_gles2:
- meson-arm64
needs:
- meson-arm64
- - debian-10-test:arm64
+ - arm_test
arm64_a630_gles31:
extends: arm64_a630_gles2
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
More information about the mesa-commit
mailing list