[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 03/13] gitlab: drop 'containers-layer2' stage
From: |
Alex Bennée |
Subject: |
[PATCH v1 03/13] gitlab: drop 'containers-layer2' stage |
Date: |
Mon, 25 Jul 2022 15:05:10 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
Since we express dependancies via a 'needs' clause, we don't need to
split container builds into separate stages. GitLab happily lets jobs
depend on other jobs in the same stage and will run them when possible.
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220722130431.2319019-4-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/container-cross.yml | 24 ++++++++++++------------
.gitlab-ci.d/stages.yml | 1 -
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index b7963498a3..505b267542 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -1,20 +1,20 @@
alpha-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-alpha-cross
amd64-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-amd64-cross
amd64-debian-user-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-all-test-cross
@@ -65,21 +65,21 @@ hexagon-cross-container:
hppa-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-hppa-cross
m68k-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-m68k-cross
mips64-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-mips64-cross
@@ -92,7 +92,7 @@ mips64el-debian-cross-container:
mips-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-mips-cross
@@ -105,7 +105,7 @@ mipsel-debian-cross-container:
powerpc-test-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian11-container']
variables:
NAME: debian-powerpc-test-cross
@@ -127,7 +127,7 @@ riscv64-debian-cross-container:
# we can however build TCG tests using a non-sid base
riscv64-debian-test-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian11-container']
variables:
NAME: debian-riscv64-test-cross
@@ -140,21 +140,21 @@ s390x-debian-cross-container:
sh4-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-sh4-cross
sparc64-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-sparc64-cross
tricore-debian-cross-container:
extends: .container_job_template
- stage: containers-layer2
+ stage: containers
needs: ['amd64-debian10-container']
variables:
NAME: debian-tricore-cross
diff --git a/.gitlab-ci.d/stages.yml b/.gitlab-ci.d/stages.yml
index f50826018d..f92f57a27d 100644
--- a/.gitlab-ci.d/stages.yml
+++ b/.gitlab-ci.d/stages.yml
@@ -3,6 +3,5 @@
# - test (for test stages, using build artefacts from a build stage)
stages:
- containers
- - containers-layer2
- build
- test
--
2.30.2
- [PATCH v1 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink, (continued)
- [PATCH v1 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink, Alex Bennée, 2022/07/25
- [PATCH v1 06/13] semihosting: Don't return negative values on qemu_semihosting_console_write() failure, Alex Bennée, 2022/07/25
- [PATCH v1 07/13] semihosting: Don't copy buffer after console_write(), Alex Bennée, 2022/07/25
- [PATCH v1 08/13] semihosting: Check for errors on SET_ARG(), Alex Bennée, 2022/07/25
- [PATCH v1 11/13] tests/tcg/s390x: Test unaligned accesses to lowcore, Alex Bennée, 2022/07/25
- [PATCH v1 10/13] qapi: Add exit-failure PanicAction, Alex Bennée, 2022/07/25
- [PATCH v1 13/13] qemu-options: bring the kernel and image options together, Alex Bennée, 2022/07/25
- [PATCH v1 12/13] docs/devel: fix description of OBJECT_DECLARE_SIMPLE_TYPE, Alex Bennée, 2022/07/25
- [PATCH v1 03/13] gitlab: drop 'containers-layer2' stage,
Alex Bennée <=
- [PATCH v1 09/13] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM, Alex Bennée, 2022/07/25