Skip to contentSkip to conversation

gitlab-ci: Document custom CI/CD variables, fix 'when:' conditions

PATCH Superseded Philippe Mathieu-Daudé 3 participants 14 messages Jul 26, 2021 – Jul 27, 2021

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover gitlab-ci: Document custom CI/CD variables, fix 'when:' conditions

Since v3:
- Unfortunately patch 4 v2 got merged as 0a9487d80af so rebase & reword.

Philippe Mathieu-Daudé (4):
docs: Document GitLab custom CI/CD variables
gitlab-ci: Fix 'when:' condition in acceptance_test_job_template
gitlab-ci: Fix 'when:' condition in EDK2 jobs
gitlab-ci: Fix 'when:' condition in OpenSBI jobs

 docs/devel/ci.rst                   | 40 +++++++++++++++++++++++++++++
 .gitlab-ci.d/buildtest-template.yml |  4 +--
 .gitlab-ci.d/edk2.yml               |  6 ++---
 .gitlab-ci.d/opensbi.yml            |  8 +++---
 .gitlab-ci.yml                      | 19 ++------------
 5 files changed, 51 insertions(+), 26 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v4 1/4 docs: Document GitLab custom CI/CD variables

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

---
 docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++
 .gitlab-ci.yml    | 19 ++-----------------
 2 files changed, 42 insertions(+), 17 deletions(-)
docs/devel/ci.rst +40 -0
index b3bf3ef615b..53df04afb7f 100644
@@ -8,6 +8,46 @@ found at::
 
    https://wiki.qemu.org/Testing/CI
 
+Custom CI/CD variables
+======================
+
+QEMU CI pipelines can be tuned setting some CI environment variables.
+
+Set variable globally in the user's CI namespace
+------------------------------------------------
+
+Variables can be set globally in the user's CI namespace setting.
+
+For further information about how to set these variables, please refer to::
+
+  https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui
+
+Set variable manually when pushing a branch or tag to the user's repository
+---------------------------------------------------------------------------
+
+Variables can be set manually when pushing a branch or tag, using
+git-push command line arguments.
+
+Example setting the QEMU_CI_EXAMPLE_VAR variable:
+
+.. code::
+
+   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
+
+For further information about how to set these variables, please refer to::
+
+  https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd
+
+Here is a list of the most used variables:
+
+QEMU_CI_AVOCADO_TESTING
+~~~~~~~~~~~~~~~~~~~~~~~
+By default, tests using the Avocado framework are not run automatically in
+the pipelines (because multiple artifacts have to be downloaded, and if
+these artifacts are not already cached, downloading them make the jobs
+reach the timeout limit). Set this variable to have the tests using the
+Avocado framework run automatically.
+
 Jobs on Custom Runners
 ======================
 
.gitlab-ci.yml +2 -17
index 6dc5385e697..9762dda2ee3 100644
@@ -16,24 +16,9 @@
 # QEMU CI jobs are based on templates. Some templates provide
 # user-configurable options, modifiable via configuration variables.
 #
-# These variables can be set globally in the user's CI namespace
-# setting:
-# https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui
-# or set manually each time a branch/tag is pushed, as a git-push
-# command line argument:
-# https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd
+# See https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables
+# for more information.
 #
-# Example setting the QEMU_CI_EXAMPLE_VAR variable:
-#
-#   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
-#
-# ----------------------------------------------------------------------
-#
-# List of environment variables that can be use to modify the set
-# of jobs selected:
-#
-# - QEMU_CI_AVOCADO_TESTING
-#   If set, tests using the Avocado framework will be run
 
 include:
   - local: '/.gitlab-ci.d/qemu-project.yml'
Signature · 1 line
2.31.1
Reviewed-by on v4 1/4
#2 lore raw

Re: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables

Quoted 5 lines · Philippe Mathieu-Daudé

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

Quoted 8 lines
---
 docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++
 .gitlab-ci.yml    | 19 ++-----------------
 2 files changed, 42 insertions(+), 17 deletions(-)
Reviewed-by on v4 1/4
#3 lore raw

Re: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables

In reply to Philippe Mathieu-Daudé
Quoted 17 lines · Philippe Mathieu-Daudé

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

---
  docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++
  .gitlab-ci.yml    | 19 ++-----------------
  2 files changed, 42 insertions(+), 17 deletions(-)
docs/devel/ci.rst +0 -0
index b3bf3ef615b..53df04afb7f 100644

docs/devel/ci.rst found at:: · line 14

Quoted 7 lines
docs/devel/ci.rst +4 -0
@@ -8,6 +8,46 @@ found at::
 
     https://wiki.qemu.org/Testing/CI
 
+Custom CI/CD variables
+======================
+
+QEMU CI pipelines can be tuned setting some CI environment variables.

"tuned *by* setting" ?

docs/devel/ci.rst found at:: · line 23

Quoted 9 lines
docs/devel/ci.rst +9 -0
+
+Set variable globally in the user's CI namespace
+------------------------------------------------
+
+Variables can be set globally in the user's CI namespace setting.
+
+For further information about how to set these variables, please refer to::
+
+  https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

The anchor does not seem to exist anymore?

Quoted 51 lines
docs/devel/ci.rst +26 -0
+Set variable manually when pushing a branch or tag to the user's repository
+---------------------------------------------------------------------------
+
+Variables can be set manually when pushing a branch or tag, using
+git-push command line arguments.
+
+Example setting the QEMU_CI_EXAMPLE_VAR variable:
+
+.. code::
+
+   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
+
+For further information about how to set these variables, please refer to::
+
+  https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd
+
+Here is a list of the most used variables:
+
+QEMU_CI_AVOCADO_TESTING
+~~~~~~~~~~~~~~~~~~~~~~~
+By default, tests using the Avocado framework are not run automatically in
+the pipelines (because multiple artifacts have to be downloaded, and if
+these artifacts are not already cached, downloading them make the jobs
+reach the timeout limit). Set this variable to have the tests using the
+Avocado framework run automatically.
+
  Jobs on Custom Runners
  ======================
 
.gitlab-ci.yml +2 -10
index 6dc5385e697..9762dda2ee3 100644
@@ -16,24 +16,9 @@
  # QEMU CI jobs are based on templates. Some templates provide
  # user-configurable options, modifiable via configuration variables.
  #
-# These variables can be set globally in the user's CI namespace
-# setting:
-# https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui
-# or set manually each time a branch/tag is pushed, as a git-push
-# command line argument:
-# https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd
+# See https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables
+# for more information.
  #
-# Example setting the QEMU_CI_EXAMPLE_VAR variable:
-#
-#   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
-#

.gitlab-ci.yml line 24

Quoted 10 lines
.gitlab-ci.yml +0 -7
-# ----------------------------------------------------------------------
-#
-# List of environment variables that can be use to modify the set
-# of jobs selected:
-#
-# - QEMU_CI_AVOCADO_TESTING
-#   If set, tests using the Avocado framework will be run
 
  include:
    - local: '/.gitlab-ci.d/qemu-project.yml'

With the two issues above fixed:

#4 lore raw

Re: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables

Quoted 13 lines · Thomas Huth
Quoted 12 lines · Philippe Mathieu-Daudé

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

---
  docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml    | 19 ++-----------------

  2 files changed, 42 insertions(+), 17 deletions(-)
Quoted 8 lines
Quoted 8 lines
docs/devel/ci.rst +0 -0
index b3bf3ef615b..53df04afb7f 100644
@@ -8,6 +8,46 @@ found at::

       https://wiki.qemu.org/Testing/CI
  +Custom CI/CD variables
+======================

[*]

Quoted 4 lines

docs/devel/ci.rst found at:: · line 14

Quoted 2 lines
docs/devel/ci.rst +2 -0
+
+QEMU CI pipelines can be tuned setting some CI environment variables.

"tuned *by* setting" ?

OK.

Quoted 15 lines
Quoted 8 lines
docs/devel/ci.rst +7 -0
+
+Set variable globally in the user's CI namespace
+------------------------------------------------
+
+Variables can be set globally in the user's CI namespace setting.
+
+For further information about how to set these variables, please
Quoted 5 lines

refer to::
+
+
https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

The anchor does not seem to exist anymore?

It will exist once this patch get merged, see [*] ;)

Quoted 75 lines
Quoted 68 lines

+Set variable manually when pushing a branch or tag to the user's repository
+---------------------------------------------------------------------------

docs/devel/ci.rst +11 -0
+
+Variables can be set manually when pushing a branch or tag, using
+git-push command line arguments.
+
+Example setting the QEMU_CI_EXAMPLE_VAR variable:
+
+.. code::
+
+   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
+
+For further information about how to set these variables, please

refer to::
+
+
https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd

docs/devel/ci.rst +6 -0
+
+Here is a list of the most used variables:
+
+QEMU_CI_AVOCADO_TESTING
+~~~~~~~~~~~~~~~~~~~~~~~
+By default, tests using the Avocado framework are not run

automatically in

docs/devel/ci.rst +5 -0
+the pipelines (because multiple artifacts have to be downloaded, and if
+these artifacts are not already cached, downloading them make the jobs
+reach the timeout limit). Set this variable to have the tests using the
+Avocado framework run automatically.
+

  Jobs on Custom Runners
  ======================
  diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dc5385e697..9762dda2ee3 100644

.gitlab-ci.yml +0 -3
@@ -16,24 +16,9 @@
   # QEMU CI jobs are based on templates. Some templates provide
   # user-configurable options, modifiable via configuration variables.
   #
-# These variables can be set globally in the user's CI namespace
-# setting:
-#

https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

.gitlab-ci.yml +0 -3
-# or set manually each time a branch/tag is pushed, as a git-push
-# command line argument:
-#

https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd

+# See
https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables
+# for more information.
  #

.gitlab-ci.yml +0 -11
-# Example setting the QEMU_CI_EXAMPLE_VAR variable:
-#
-#   git push -o ci.variable="QEMU_CI_EXAMPLE_VAR=value" myrepo mybranch
-#
-# ----------------------------------------------------------------------
-#
-# List of environment variables that can be use to modify the set
-# of jobs selected:
-#
-# - QEMU_CI_AVOCADO_TESTING
-#   If set, tests using the Avocado framework will be run
Quoted 3 lines

    include:
    - local: '/.gitlab-ci.d/qemu-project.yml'

With the two issues above fixed:

#5 lore raw

Re: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables

Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 13 lines · Thomas Huth
Quoted 12 lines · Philippe Mathieu-Daudé

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

---
   docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++
   .gitlab-ci.yml    | 19 ++-----------------
   2 files changed, 42 insertions(+), 17 deletions(-)
Quoted 8 lines

docs/devel/ci.rst found at:: · line 10

Quoted 8 lines
docs/devel/ci.rst +1 -0
index b3bf3ef615b..53df04afb7f 100644
@@ -8,6 +8,46 @@ found at::
        https://wiki.qemu.org/Testing/CI
   +Custom CI/CD variables
+======================

[*]

Quoted 4 lines

docs/devel/ci.rst found at:: · line 14

Quoted 2 lines
docs/devel/ci.rst +2 -0
+
+QEMU CI pipelines can be tuned setting some CI environment variables.

"tuned *by* setting" ?

OK.

Quoted 15 lines
Quoted 11 lines
docs/devel/ci.rst +7 -0
+
+Set variable globally in the user's CI namespace
+------------------------------------------------
+
+Variables can be set globally in the user's CI namespace setting.
+
+For further information about how to set these variables, please

refer to::

docs/devel/ci.rst +2 -0
+
+
Quoted 2 lines

https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

The anchor does not seem to exist anymore?

Quoted 1 line

It will exist once this patch get merged, see [*] ;)

The above URL points to the official gitlab documentation...

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines

index 6dc5385e697..9762dda2ee3 100644

.gitlab-ci.yml +0 -3
@@ -16,24 +16,9 @@
   # QEMU CI jobs are based on templates. Some templates provide
   # user-configurable options, modifiable via configuration variables.
   #
-# These variables can be set globally in the user's CI namespace
-# setting:
-#

https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
.gitlab-ci.yml +0 -3
-# or set manually each time a branch/tag is pushed, as a git-push
-# command line argument:
-#

https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd

+# See
https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables
+# for more information.

... and not to the new one here. I think you mixed that up.

Thomas

#6 lore raw

Re: [PATCH-for-6.1 v4 1/4] docs: Document GitLab custom CI/CD variables

Quoted 73 lines · Thomas Huth
Quoted 49 lines · Philippe Mathieu-Daudé
Quoted 13 lines · Thomas Huth
Quoted 12 lines · Philippe Mathieu-Daudé

We introduced the QEMU_CI_AVOCADO_TESTING variable in commit f56bf4caf ("gitlab: Run Avocado tests manually (except mainstream CI)"), but forgot to document it properly. Do it now.

---
   docs/devel/ci.rst | 40 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml    | 19 ++-----------------

   2 files changed, 42 insertions(+), 17 deletions(-)
Quoted 8 lines
Quoted 8 lines
docs/devel/ci.rst +0 -0
index b3bf3ef615b..53df04afb7f 100644
@@ -8,6 +8,46 @@ found at::

        https://wiki.qemu.org/Testing/CI
   +Custom CI/CD variables
+======================

[*]

Quoted 4 lines

docs/devel/ci.rst found at:: · line 14

Quoted 2 lines
docs/devel/ci.rst +2 -0
+
+QEMU CI pipelines can be tuned setting some CI environment variables.

"tuned *by* setting" ?

OK.

Quoted 16 lines
Quoted 11 lines
docs/devel/ci.rst +7 -0
+
+Set variable globally in the user's CI namespace
+------------------------------------------------
+
+Variables can be set globally in the user's CI namespace setting.
+
+For further information about how to set these variables, please

refer to::

docs/devel/ci.rst +2 -0
+
+
Quoted 3 lines

https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

The anchor does not seem to exist anymore?

Quoted 1 line

It will exist once this patch get merged, see [*] ;)

The above URL points to the official gitlab documentation...

Quoted 19 lines
Quoted 19 lines
Quoted 19 lines

index 6dc5385e697..9762dda2ee3 100644

.gitlab-ci.yml +0 -3
@@ -16,24 +16,9 @@
    # QEMU CI jobs are based on templates. Some templates provide
    # user-configurable options, modifiable via configuration variables.
    #
-# These variables can be set globally in the user's CI namespace
-# setting:
-#

https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui

.gitlab-ci.yml +0 -3
-# or set manually each time a branch/tag is pushed, as a git-push
-# command line argument:
-#

https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd

Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

+# See
https://qemu-project.gitlab.io/qemu/devel/ci.html#custom-ci-cd-variables

+# for more information.

... and not to the new one here. I think you mixed that up.

Oops, thanks for double-checking!

#7 lore raw

PATCH v4 2/4 gitlab-ci: Fix 'when:' condition in acceptance_test_job_template

In reply to Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Fixes f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)")
---
 .gitlab-ci.d/buildtest-template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/buildtest-template.yml +2 -2
index 3e3e19d96bd..fcbcc4e627a 100644
@@ -73,9 +73,9 @@
     # in its namespace setting or via git-push option, see documentation
     # in /.gitlab-ci.yml of this repository).
     - if: '$CI_PROJECT_NAMESPACE == "qemu-project"'
-      when: always
+      when: on_success
     - if: '$QEMU_CI_AVOCADO_TESTING'
-      when: always
+      when: on_success
     # Otherwise, set to manual (the jobs are created but not run).
     - when: manual
       allow_failure: true
Signature · 1 line
2.31.1
Reviewed-by on v4 2/4
#8 lore raw

Re: [PATCH-for-6.1 v4 2/4] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template

Quoted 6 lines · Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Quoted 8 lines
Fixes f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)")
---
 .gitlab-ci.d/buildtest-template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by on v4 2/4
#9 lore raw

Re: [PATCH-for-6.1 v4 2/4] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template

In reply to Philippe Mathieu-Daudé
Quoted 20 lines · Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Fixes f56bf4caf71 ("gitlab: Run Avocado tests manually (except mainstream CI)")
---
  .gitlab-ci.d/buildtest-template.yml | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/buildtest-template.yml +0 -0
index 3e3e19d96bd..fcbcc4e627a 100644
@@ -73,9 +73,9 @@
      # in its namespace setting or via git-push option, see documentation

.gitlab-ci.d/buildtest-template.yml line 81

Quoted 10 lines
.gitlab-ci.d/buildtest-template.yml +2 -2
      # in /.gitlab-ci.yml of this repository).
      - if: '$CI_PROJECT_NAMESPACE == "qemu-project"'
-      when: always
+      when: on_success
      - if: '$QEMU_CI_AVOCADO_TESTING'
-      when: always
+      when: on_success
      # Otherwise, set to manual (the jobs are created but not run).
      - when: manual
        allow_failure: true
#10 lore raw

PATCH v4 3/4 gitlab-ci: Fix 'when:' condition in EDK2 jobs

In reply to Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Fixes 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries")
---
 .gitlab-ci.d/edk2.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
.gitlab-ci.d/edk2.yml +3 -3
index aae2f7ad880..62497ba47fb 100644
@@ -8,11 +8,11 @@
    - .gitlab-ci.d/edk2/Dockerfile
    # or roms/edk2/ is modified (submodule updated)
    - roms/edk2/*
-   when: always
+   when: on_success
  - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
-   when: always
+   when: on_success
  - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
-   when: always
+   when: on_success
 
 docker-edk2:
  extends: .edk2_job_rules
Signature · 1 line
2.31.1
Reviewed-by on v4 3/4
#11 lore raw

Re: [PATCH-for-6.1 v4 3/4] gitlab-ci: Fix 'when:' condition in EDK2 jobs

Quoted 6 lines · Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Quoted 8 lines
Fixes 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries")
---
 .gitlab-ci.d/edk2.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by on v4 3/4
#12 lore raw

Re: [PATCH-for-6.1 v4 3/4] gitlab-ci: Fix 'when:' condition in EDK2 jobs

In reply to Philippe Mathieu-Daudé
Quoted 22 lines · Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Fixes 71920809cea ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries")
---
  .gitlab-ci.d/edk2.yml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
.gitlab-ci.d/edk2.yml +0 -1
index aae2f7ad880..62497ba47fb 100644
@@ -8,11 +8,11 @@
     - .gitlab-ci.d/edk2/Dockerfile
     # or roms/edk2/ is modified (submodule updated)
     - roms/edk2/*
-   when: always

.gitlab-ci.d/edk2.yml line 18

Quoted 10 lines
.gitlab-ci.d/edk2.yml +3 -2
+   when: on_success
   - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
-   when: always
+   when: on_success
   - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
-   when: always
+   when: on_success
 
  docker-edk2:
   extends: .edk2_job_rules
#13 lore raw

PATCH v4 4/4 gitlab-ci: Fix 'when:' condition in OpenSBI jobs

In reply to Philippe Mathieu-Daudé

Jobs depending on another should not use the 'when: always' condition, because if a dependency failed we should not keep running jobs depending on it. The correct condition is 'when: on_success'.

Fixes c6fc0fc1a71 ("gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries")
---
 .gitlab-ci.d/opensbi.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
.gitlab-ci.d/opensbi.yml +4 -4
index d8a0456679e..5e0a2477c5d 100644
@@ -6,14 +6,14 @@
    - .gitlab-ci.d/opensbi.yml
    # or the Dockerfile is modified
    - .gitlab-ci.d/opensbi/Dockerfile
-   when: always
+   when: on_success
  - changes: # or roms/opensbi/ is modified (submodule updated)
    - roms/opensbi/*
-   when: always
+   when: on_success
  - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
-   when: always
+   when: on_success
  - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
-   when: always
+   when: on_success
 
 docker-opensbi:
  extends: .opensbi_job_rules
Signature · 1 line
2.31.1