mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: drop 'containers-layer2' stage

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé 2022-07-25 15:05:10 +01:00 committed by Alex Bennée
parent 998f334722
commit ca58b4931e
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.gitlab-ci.d/container-cross.yml
View File

@ -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

1
.gitlab-ci.d/stages.yml
View File

@ -3,6 +3,5 @@
# - test (for test stages, using build artefacts from a build stage)
stages:
- containers
- containers-layer2
- build
- test