* [PULL 0/5] OVMF patches for 2021-07-14
@ 2021-07-14 20:42 Philippe Mathieu-Daudé
2021-07-14 20:42 ` [PULL 1/5] gitlab-ci: Extract EDK2 job rules to reusable section Philippe Mathieu-Daudé
2021-07-15 15:05 ` [PULL 0/5] OVMF patches for 2021-07-14 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-14 20:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Dov Murik, Philippe Mathieu-Daudé, Laszlo Ersek
The following changes since commit a9649a719a44894b81f38dc1c5c1888ee684acef:
Merge remote-tracking branch 'remotes/cleber-gitlab/tags/python-next-pull-request' into staging (2021-07-14 18:09:09 +0100)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/fw-edk2-20210714
for you to fetch changes up to 2669350db2c3df33f4e68c518e9f31f91502a83d:
MAINTAINERS: remove Laszlo Ersek's entries (2021-07-14 22:28:59 +0200)
----------------------------------------------------------------
Patches related to EDK2/OVMF
- MAINTAINERS: remove Laszlo Ersek's entries
- Introduce X86_FW_OVMF Kconfig symbol
- pc_system_ovmf_table_find: Assert that flash was parsed, document
- gitlab-ci: Fix the jobs building EDK2 blobs
----------------------------------------------------------------
Dov Murik (2):
hw/i386/pc: pc_system_ovmf_table_find: Assert that flash was parsed
hw/i386/pc: Document pc_system_ovmf_table_find
Laszlo Ersek (1):
MAINTAINERS: remove Laszlo Ersek's entries
Philippe Mathieu-Daudé (2):
gitlab-ci: Extract EDK2 job rules to reusable section
hw/i386: Introduce X86_FW_OVMF Kconfig symbol
include/hw/i386/pc.h | 1 +
hw/i386/pc_sysfw.c | 107 ------------------------
hw/i386/pc_sysfw_ovmf-stubs.c | 26 ++++++
hw/i386/pc_sysfw_ovmf.c | 151 ++++++++++++++++++++++++++++++++++
.gitlab-ci.d/edk2.yml | 27 +++---
MAINTAINERS | 4 +-
hw/i386/Kconfig | 4 +
hw/i386/meson.build | 2 +
8 files changed, 201 insertions(+), 121 deletions(-)
create mode 100644 hw/i386/pc_sysfw_ovmf-stubs.c
create mode 100644 hw/i386/pc_sysfw_ovmf.c
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/5] gitlab-ci: Extract EDK2 job rules to reusable section
2021-07-14 20:42 [PULL 0/5] OVMF patches for 2021-07-14 Philippe Mathieu-Daudé
@ 2021-07-14 20:42 ` Philippe Mathieu-Daudé
2021-07-15 15:05 ` [PULL 0/5] OVMF patches for 2021-07-14 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-07-14 20:42 UTC (permalink / raw)
To: qemu-devel
Cc: Dov Murik, Philippe Mathieu-Daudé,
Willian Rampazzo, Laszlo Ersek, Daniel P . Berrangé
All jobs depending on 'docker-edk2' 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-edk2' and 'build-edk2' jobs.
The problem was introduced in commit 71920809cea ("gitlab-ci.yml:
Add jobs to build EDK2 firmware binaries"), but was revealed in
commit 1925468ddbf ("docker: EDK2 build job depends on EDK2
container") and eventually failed on CI:
https://gitlab.com/qemu-project/qemu/-/pipelines/335995843
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210714101003.3113726-1-philmd@redhat.com>
---
.gitlab-ci.d/edk2.yml | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
index ba7280605c4..aae2f7ad880 100644
--- a/.gitlab-ci.d/edk2.yml
+++ b/.gitlab-ci.d/edk2.yml
@@ -1,10 +1,22 @@
-docker-edk2:
- stage: containers
- rules: # Only run this job when the Dockerfile is modified
+# All jobs needing docker-edk2 must use the same rules it uses.
+.edk2_job_rules:
+ rules: # Only run this job when ...
- changes:
+ # this file is modified
- .gitlab-ci.d/edk2.yml
+ # or the Dockerfile is modified
- .gitlab-ci.d/edk2/Dockerfile
+ # or roms/edk2/ is modified (submodule updated)
+ - roms/edk2/*
when: always
+ - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
+ when: always
+ - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
+ when: always
+
+docker-edk2:
+ extends: .edk2_job_rules
+ stage: containers
image: docker:19.03.1
services:
- docker:19.03.1-dind
@@ -24,16 +36,9 @@ docker-edk2:
- docker push $IMAGE_TAG
build-edk2:
+ extends: .edk2_job_rules
stage: build
needs: ['docker-edk2']
- rules: # Only run this job when ...
- - changes: # ... roms/edk2/ is modified (submodule updated)
- - roms/edk2/*
- when: always
- - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with 'edk2'
- when: always
- - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description contains 'EDK2'
- when: always
artifacts:
paths: # 'artifacts.zip' will contains the following files:
- pc-bios/edk2*bz2
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/5] OVMF patches for 2021-07-14
2021-07-14 20:42 [PULL 0/5] OVMF patches for 2021-07-14 Philippe Mathieu-Daudé
2021-07-14 20:42 ` [PULL 1/5] gitlab-ci: Extract EDK2 job rules to reusable section Philippe Mathieu-Daudé
@ 2021-07-15 15:05 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2021-07-15 15:05 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Dov Murik, Laszlo Ersek, QEMU Developers
On Wed, 14 Jul 2021 at 21:45, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> The following changes since commit a9649a719a44894b81f38dc1c5c1888ee684acef:
>
> Merge remote-tracking branch 'remotes/cleber-gitlab/tags/python-next-pull-request' into staging (2021-07-14 18:09:09 +0100)
>
> are available in the Git repository at:
>
> https://github.com/philmd/qemu.git tags/fw-edk2-20210714
>
> for you to fetch changes up to 2669350db2c3df33f4e68c518e9f31f91502a83d:
>
> MAINTAINERS: remove Laszlo Ersek's entries (2021-07-14 22:28:59 +0200)
>
> ----------------------------------------------------------------
> Patches related to EDK2/OVMF
>
> - MAINTAINERS: remove Laszlo Ersek's entries
> - Introduce X86_FW_OVMF Kconfig symbol
> - pc_system_ovmf_table_find: Assert that flash was parsed, document
> - gitlab-ci: Fix the jobs building EDK2 blobs
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-15 15:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-14 20:42 [PULL 0/5] OVMF patches for 2021-07-14 Philippe Mathieu-Daudé
2021-07-14 20:42 ` [PULL 1/5] gitlab-ci: Extract EDK2 job rules to reusable section Philippe Mathieu-Daudé
2021-07-15 15:05 ` [PULL 0/5] OVMF patches for 2021-07-14 Peter Maydell
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.