From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Willian Rampazzo" <willianr@redhat.com>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 28/28] gitlab-ci: Extract OpenSBI job rules to reusable section
Date: Fri, 23 Jul 2021 18:03:54 +0100 [thread overview]
Message-ID: <20210723170354.18975-29-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210723170354.18975-1-alex.bennee@linaro.org>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
All jobs depending on 'docker-opensbi' job must use at most all
the rules that triggers it. The simplest way to ensure that
is to always use the same rules. Extract all the rules to a
reusable section, and include this section (with the 'extends'
keyword) in both 'docker-opensbi' and 'build-opensbi' jobs.
The problem was introduced in commit c6fc0fc1a71 ("gitlab-ci.yml:
Add jobs to build OpenSBI firmware binaries"), but was revealed in
commit 91e9c47e50a ("docker: OpenSBI build job depends on OpenSBI
container").
This fix is similar to the one used with the EDK2 firmware job in
commit ac0595cf6b3 ("gitlab-ci: Extract EDK2 job rules to reusable
section").
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210720164829.3949558-1-philmd@redhat.com>
Message-Id: <20210720232703.10650-30-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index f66cd1d908..d8a0456679 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -1,10 +1,23 @@
-docker-opensbi:
- stage: containers
- rules: # Only run this job when the Dockerfile is modified
+# All jobs needing docker-opensbi must use the same rules it uses.
+.opensbi_job_rules:
+ rules: # Only run this job when ...
- changes:
+ # this file is modified
- .gitlab-ci.d/opensbi.yml
+ # or the Dockerfile is modified
- .gitlab-ci.d/opensbi/Dockerfile
when: always
+ - changes: # or roms/opensbi/ is modified (submodule updated)
+ - roms/opensbi/*
+ when: always
+ - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
+ when: always
+ - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
+ when: always
+
+docker-opensbi:
+ extends: .opensbi_job_rules
+ stage: containers
image: docker:19.03.1
services:
- docker:19.03.1-dind
@@ -24,16 +37,9 @@ docker-opensbi:
- docker push $IMAGE_TAG
build-opensbi:
+ extends: .opensbi_job_rules
stage: build
needs: ['docker-opensbi']
- rules: # Only run this job when ...
- - changes: # ... roms/opensbi/ is modified (submodule updated)
- - roms/opensbi/*
- when: always
- - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'
- when: always
- - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'
- when: always
artifacts:
paths: # 'artifacts.zip' will contains the following files:
- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
--
2.20.1
next prev parent reply other threads:[~2021-07-23 17:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 17:03 [PULL for 6.1-rc1 00/28] doc, metadata, plugin and testing updates Alex Bennée
2021-07-23 17:03 ` [PULL 01/28] gitignore: Update with some filetypes Alex Bennée
2021-07-23 17:03 ` [PULL 02/28] docs: collect the disparate device emulation docs into one section Alex Bennée
2021-07-23 17:03 ` [PULL 03/28] docs: add a section on the generalities of vhost-user Alex Bennée
2021-07-23 17:03 ` [PULL 04/28] configure: remove needless if leg Alex Bennée
2021-07-23 17:03 ` [PULL 05/28] contrib/gitdm: add some new aliases to fix up commits Alex Bennée
2021-07-23 17:03 ` [PULL 06/28] .mailmap: fix up some broken commit authors Alex Bennée
2021-07-23 17:03 ` [PULL 07/28] contrib/gitdm: add domain-map for MontaVista Alex Bennée
2021-07-23 17:03 ` [PULL 08/28] contrib/gitdm: add a group mapping for robot scanners Alex Bennée
2021-07-23 17:03 ` [PULL 09/28] gitdm.config: sort the corporate GroupMap entries Alex Bennée
2021-07-23 17:03 ` [PULL 10/28] contrib/gitdm: add domain-map/group-map mappings for Samsung Alex Bennée
2021-07-23 17:03 ` [PULL 11/28] contrib/gitdm: add domain-map for Eldorado Alex Bennée
2021-07-23 17:03 ` [PULL 12/28] contrib/gitdm: add domain-map/group-map for Wind River Alex Bennée
2021-07-23 17:03 ` [PULL 13/28] contrib/gitdm: un-ironically add a mapping for LWN Alex Bennée
2021-07-23 17:03 ` [PULL 14/28] contrib/gitdm: add domain-map for Crudebyte Alex Bennée
2021-07-23 17:03 ` [PULL 15/28] contrib/gitdm: add domain-map for NVIDIA Alex Bennée
2021-07-23 17:03 ` [PULL 16/28] contrib/gitdm: add group-map for Netflix Alex Bennée
2021-07-23 17:03 ` [PULL 17/28] contrib/gitdm: add an explicit academic entry for BU Alex Bennée
2021-07-23 17:03 ` [PULL 18/28] contrib/gitdm: add a new interns group-map for GSoC/Outreachy work Alex Bennée
2021-07-23 17:03 ` [PULL 19/28] contrib/gitdm: add more individual contributor entries Alex Bennée
2021-07-23 17:03 ` [PULL 20/28] tcg/plugins: implement a qemu_plugin_user_exit helper Alex Bennée
2021-07-23 17:03 ` [PULL 21/28] plugins/cache: Fixed a bug with destroying FIFO metadata Alex Bennée
2021-07-23 17:03 ` [PULL 22/28] plugins/cache: limited the scope of a mutex lock Alex Bennée
2021-07-23 17:03 ` [PULL 23/28] plugins/cache: Fixed "function decl. is not a prototype" warnings Alex Bennée
2021-07-23 17:03 ` [PULL 24/28] plugins: Fix physical address calculation for IO regions Alex Bennée
2021-07-23 17:03 ` [PULL 25/28] tests/tcg/configure.sh: add handling for assembler only builds Alex Bennée
2021-07-23 17:03 ` [PULL 26/28] gitlab: enable a very minimal build with the tricore container Alex Bennée
2021-07-23 17:03 ` [PULL 27/28] gitlab-ci: Remove the second superfluous macos task Alex Bennée
2021-07-23 17:03 ` Alex Bennée [this message]
2021-07-23 17:44 ` [PULL for 6.1-rc1 00/28] doc, metadata, plugin and testing updates Philippe Mathieu-Daudé
2021-07-24 10:04 ` Peter Maydell
2021-07-26 8:45 ` Daniel P. Berrangé
2021-07-26 12:36 ` Peter Maydell
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=20210723170354.18975-29-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=bmeng.cn@gmail.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.