Skip to contentSkip to conversation

.gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages

PATCH In review Thomas Huth 2 participants 2 messages May 24, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages

The "riscv64-debian-cross-container" job does not depend on any other container job from the first stage, so we can move it to the first stage, too.

The "riscv64-debian-test-cross-container" job needs the debian11 container, so we should add a proper "needs:" statement here.

---
 .gitlab-ci.d/container-cross.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
.gitlab-ci.d/container-cross.yml +2 -1
index 26281ce4f9..f21d7a2a14 100644
@@ -123,7 +123,7 @@ ppc64el-debian-cross-container:
 
 riscv64-debian-cross-container:
   extends: .container_job_template
-  stage: containers-layer2
+  stage: containers
   # as we are currently based on 'sid/unstable' we may break so...
   allow_failure: true
   variables:
@@ -133,6 +133,7 @@ riscv64-debian-cross-container:
 riscv64-debian-test-cross-container:
   extends: .container_job_template
   stage: containers-layer2
+  needs: ['amd64-debian11-container']
   variables:
     NAME: debian-riscv64-test-cross
 
Signature · 1 line
2.27.0
#1 lore raw
Quoted 6 lines · Thomas Huth

The "riscv64-debian-cross-container" job does not depend on any other container job from the first stage, so we can move it to the first stage, too.

The "riscv64-debian-test-cross-container" job needs the debian11 container, so we should add a proper "needs:" statement here.

Queued to testing/next, thanks.

Signature · 1 line
Alex Bennée