From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org, richard.henderson@linaro.org
Cc: qemu-devel@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PULL 03/13] gitlab: drop 'containers-layer2' stage
Date: Fri, 29 Jul 2022 10:19:33 +0100 [thread overview]
Message-ID: <20220729091943.2152410-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220729091943.2152410-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <berrange@redhat.com>
Since we express dependencies 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>
[AJB: fix typo]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220725140520.515340-4-alex.bennee@linaro.org>
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
next prev parent reply other threads:[~2022-07-29 9:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 9:19 [PULL 00/13] testing, semihosting and doc fixes Alex Bennée
2022-07-29 9:19 ` [PULL 01/13] tests: refresh to latest libvirt-ci module Alex Bennée
2022-07-29 9:19 ` [PULL 02/13] gitlab: show testlog.txt contents when cirrus/custom-runner jobs fail Alex Bennée
2022-07-29 9:19 ` Alex Bennée [this message]
2022-07-29 9:19 ` [PULL 04/13] .cirrus.yml: Change winsymlinks to 'native' Alex Bennée
2022-07-29 9:19 ` [PULL 05/13] .gitlab-ci.d/windows.yml: Enable native Windows symlink Alex Bennée
2022-07-29 9:19 ` [PULL 06/13] semihosting: Don't return negative values on qemu_semihosting_console_write() failure Alex Bennée
2022-07-29 9:19 ` [PULL 07/13] semihosting: Don't copy buffer after console_write() Alex Bennée
2022-07-29 9:19 ` [PULL 08/13] semihosting: Check for errors on SET_ARG() Alex Bennée
2022-07-29 9:19 ` [PULL 09/13] semihosting: Fix handling of buffer in TARGET_SYS_TMPNAM Alex Bennée
2022-07-29 9:19 ` [PULL 10/13] qapi: Add exit-failure PanicAction Alex Bennée
2022-07-29 9:19 ` [PULL 11/13] tests/tcg/s390x: Test unaligned accesses to lowcore Alex Bennée
2022-07-29 9:19 ` [PULL 12/13] docs/devel: fix description of OBJECT_DECLARE_SIMPLE_TYPE Alex Bennée
2022-07-29 9:19 ` [PULL 13/13] qemu-options: bring the kernel and image options together Alex Bennée
2022-07-29 15:36 ` [PULL 00/13] testing, semihosting and doc fixes Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220729091943.2152410-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).