summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-11-07 20:08:03 +0100
committerMichel Dänzer <michel@daenzer.net>2019-11-15 16:21:10 +0100
commit506e9d5fc712b828584fe6e7afe980efb225e727 (patch)
tree837d84e81de9f76dd7cf18fdb6b2efa3ef081aa7 /.gitlab-ci
parent3a48f4565e4fd00b35144dc785ca0d38220cff3d (diff)
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@anholt.net> # v1 Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/arm_build.sh (renamed from .gitlab-ci/debian-arm64-install.sh)0
-rw-r--r--.gitlab-ci/container/arm_test.sh (renamed from .gitlab-ci/debian-arm64-test-install.sh)0
-rw-r--r--.gitlab-ci/container/lava_arm.sh (renamed from .gitlab-ci/lava-debian-install.sh)1
-rw-r--r--.gitlab-ci/container/x86_build.sh (renamed from .gitlab-ci/debian-install.sh)0
-rw-r--r--.gitlab-ci/container/x86_build_old.sh (renamed from .gitlab-ci/debian-stretch-install.sh)0
-rw-r--r--.gitlab-ci/container/x86_test.sh (renamed from .gitlab-ci/debian-test-install.sh)0
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
7 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/container/arm_build.sh
index c08746b1df2..c08746b1df2 100644
--- a/.gitlab-ci/debian-arm64-install.sh
+++ b/.gitlab-ci/container/arm_build.sh
diff --git a/.gitlab-ci/debian-arm64-test-install.sh b/.gitlab-ci/container/arm_test.sh
index 2ea6327cb84..2ea6327cb84 100644
--- a/.gitlab-ci/debian-arm64-test-install.sh
+++ b/.gitlab-ci/container/arm_test.sh
diff --git a/.gitlab-ci/lava-debian-install.sh b/.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
index 374d1e8bb86..374d1e8bb86 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/container/x86_build.sh
diff --git a/.gitlab-ci/debian-stretch-install.sh b/.gitlab-ci/container/x86_build_old.sh
index 906274527b9..906274527b9 100644
--- a/.gitlab-ci/debian-stretch-install.sh
+++ b/.gitlab-ci/container/x86_build_old.sh
diff --git a/.gitlab-ci/debian-test-install.sh b/.gitlab-ci/container/x86_test.sh
index bb48c470922..bb48c470922 100644
--- a/.gitlab-ci/debian-test-install.sh
+++ b/.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: