[v1,01/33] .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages

Commit Message

Alex Bennée May 27, 2022, 3:35 p.m. UTC

From: Thomas Huth <[e-mail]>

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.

Signed-off-by: Thomas Huth <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Alex Bennée <[e-mail]>
---
 .gitlab-ci.d/container-cross.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alistair Francis May 31, 2022, 12:18 a.m. UTC | #1

On Sat, May 28, 2022 at 1:36 AM Alex Bennée <[e-mail]> wrote:
>
> From: Thomas Huth <[e-mail]>
>
> 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.
>
> Signed-off-by: Thomas Huth <[e-mail]>
> Message-Id: <[e-mail]>
> Signed-off-by: Alex Bennée <[e-mail]>

Reviewed-by: Alistair Francis <[e-mail]>

Alistair

> ---
>  .gitlab-ci.d/container-cross.yml | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
> index e622ac2d21..ac15fce9b6 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -125,7 +125,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:
> @@ -135,6 +135,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
>
> --
> 2.30.2
>
>

Patch

diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index e622ac2d21..ac15fce9b6 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -125,7 +125,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:
@@ -135,6 +135,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