Mesa (master): gitlab-ci: Rename container install scripts to match job names (better)
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Nov 15 16:00:22 UTC 2019
Module: Mesa
Branch: master
Commit: 506e9d5fc712b828584fe6e7afe980efb225e727
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=506e9d5fc712b828584fe6e7afe980efb225e727
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Thu Nov 7 20:08:03 2019 +0100
gitlab-ci: Rename container install scripts to match job names (better)
Cleans up .gitlab-ci/ a little, and allows using a single DEBIAN_EXEC
line for all container jobs.
v2:
* Use lava_arm.sh instead of arm_lava.sh for consistency with v2 of the
previous change
Reviewed-by: Eric Anholt <eric at anholt.net> # v1
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
---
.gitlab-ci.yml | 7 +------
.gitlab-ci/{debian-arm64-install.sh => container/arm_build.sh} | 0
.gitlab-ci/{debian-arm64-test-install.sh => container/arm_test.sh} | 0
.gitlab-ci/{lava-debian-install.sh => container/lava_arm.sh} | 1 -
.gitlab-ci/{debian-install.sh => container/x86_build.sh} | 0
.../{debian-stretch-install.sh => container/x86_build_old.sh} | 0
.gitlab-ci/{debian-test-install.sh => container/x86_test.sh} | 0
.gitlab-ci/lava-gitlab-ci.yml | 2 +-
8 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73b56a388be..409d84df83f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,6 +89,7 @@ stages:
extends:
- .ci-run-policy
variables:
+ DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
@@ -96,8 +97,6 @@ x86_build:
extends:
- .debian at container-ifnot-exists
- .container
- variables:
- DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
.use-x86_build:
image: $DEBIAN_IMAGE
@@ -108,7 +107,6 @@ x86_test:
extends: x86_build
variables:
DEBIAN_TAG: "$DEBIAN_TEST_TAG"
- DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
x86_build_old:
extends: x86_build
@@ -116,7 +114,6 @@ x86_build_old:
DEBIAN_TAG: $STRETCH_TAG
DEBIAN_VERSION: $STRETCH_VERSION
DEBIAN_IMAGE: $STRETCH_IMAGE
- DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh'
.use-x86_build_old:
image: $STRETCH_IMAGE
@@ -129,7 +126,6 @@ arm_build:
- .container
variables:
DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
- DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh'
arm_test:
extends:
@@ -137,7 +133,6 @@ arm_test:
- .container
variables:
DEBIAN_TAG: "$DEBIAN_ARM64_TEST_TAG"
- DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-test-install.sh'
# BUILD
diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/container/arm_build.sh
similarity index 100%
rename from .gitlab-ci/debian-arm64-install.sh
rename to .gitlab-ci/container/arm_build.sh
diff --git a/.gitlab-ci/debian-arm64-test-install.sh b/.gitlab-ci/container/arm_test.sh
similarity index 100%
rename from .gitlab-ci/debian-arm64-test-install.sh
rename to .gitlab-ci/container/arm_test.sh
diff --git a/.gitlab-ci/lava-debian-install.sh b/.gitlab-ci/container/lava_arm.sh
similarity index 99%
rename from .gitlab-ci/lava-debian-install.sh
rename to .gitlab-ci/container/lava_arm.sh
index be0b1c64805..429dca0e1d6 100644
--- a/.gitlab-ci/lava-debian-install.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -184,4 +184,3 @@ chroot /artifacts/rootfs sh /create-rootfs.sh
rm /artifacts/rootfs/bin/qemu-arm-static
rm /artifacts/rootfs/bin/qemu-aarch64-static
rm /artifacts/rootfs/create-rootfs.sh
-
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/container/x86_build.sh
similarity index 100%
rename from .gitlab-ci/debian-install.sh
rename to .gitlab-ci/container/x86_build.sh
diff --git a/.gitlab-ci/debian-stretch-install.sh b/.gitlab-ci/container/x86_build_old.sh
similarity index 100%
rename from .gitlab-ci/debian-stretch-install.sh
rename to .gitlab-ci/container/x86_build_old.sh
diff --git a/.gitlab-ci/debian-test-install.sh b/.gitlab-ci/container/x86_test.sh
similarity index 100%
rename from .gitlab-ci/debian-test-install.sh
rename to .gitlab-ci/container/x86_test.sh
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 763b06d97ba..cf896d720cd 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -36,7 +36,7 @@ include:
DEFCONFIG=${DEFCONFIG}
DEVICE_TREES="${DEVICE_TREES}"
KERNEL_IMAGE_NAME=${KERNEL_IMAGE_NAME}
- bash .gitlab-ci/lava-debian-install.sh'
+ bash .gitlab-ci/container/lava_arm.sh'
DEBIAN_VERSION: ${LAVA_DEBIAN_VERSION}
lava_armhf:
More information about the mesa-commit
mailing list