openstack/tripleo-common
Code Issues Proposed changes

Fix missing 50-edk2-ovmf-*.json files handling

Browse Source 
Follow-up Ieaacb67d16e82e9c34fcfb31398da5a95cdc3d43
Add missing tests for /usr/share/qemu/firmware/50-edk2-ovmf-*.json

Note: it also comment out the upgrades jobs in order to not fail on Zed
line which is also affected.

Related: rhbz#2090752
Related: rhbz#2109644
Closes-bug: #2001626

Change-Id: I540c681687f5502aaa2e0b9d8b81b5fef83b2bc2
Co-Authored-By: Cedric Jeanneret <cjeanner@redhat.com>
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2023-01-04 13:39:25 +01:00 committed by Cédric Jeanneret
parent 533a0c7ee9
commit 6c8fccb888
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/tcib/base/os/nova-base/nova-compute/nova-compute.yaml
View File

@ -6,7 +6,7 @@ tcib_actions:
- run: bash /usr/local/bin/uid_gid_manage nova
- run: rm -f /etc/machine-id
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-compute /openstack/healthcheck && chmod a+rx /openstack/healthcheck
- run: test -f /usr/share/qemu/firmware/50-edk2-ovmf-cc.json && jq ".mapping[\"nvram-template\"] = $(jq ".mapping[\"nvram-template\"]" /usr/share/qemu/firmware/50-edk2-ovmf-cc.json)" /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json > /tmp/50-edk2-ovmf-amdsev_.json && mv -f /tmp/50-edk2-ovmf-amdsev_.json /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json
- run: if [ -f /usr/share/qemu/firmware/50-edk2-ovmf-cc.json ] && [ -f /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json ]; then jq ".mapping[\"nvram-template\"] = $(jq ".mapping[\"nvram-template\"]" /usr/share/qemu/firmware/50-edk2-ovmf-cc.json)" /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json > /tmp/50-edk2-ovmf-amdsev_.json && mv -f /tmp/50-edk2-ovmf-amdsev_.json /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json; fi
tcib_packages:
common:
- ceph-common

2
container-images/tcib/base/os/nova-base/nova-libvirt/nova-libvirt.yaml
View File

@ -3,7 +3,7 @@ tcib_actions:
- run: if [ '{{ tcib_release }}' == '8' ]; then dnf -y install {{ tcib_packages['el8'] | join(' ') }}; fi
- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-libvirt /openstack/healthcheck && chmod a+rx /openstack/healthcheck
- run: jq ".mapping[\"nvram-template\"] = $(jq ".mapping[\"nvram-template\"]" /usr/share/qemu/firmware/50-edk2-ovmf-cc.json)" /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json > /tmp/50-edk2-ovmf-amdsev_.json && mv -f /tmp/50-edk2-ovmf-amdsev_.json /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json
- run: if [ -f /usr/share/qemu/firmware/50-edk2-ovmf-cc.json ] && [ -f /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json ]; then jq ".mapping[\"nvram-template\"] = $(jq ".mapping[\"nvram-template\"]" /usr/share/qemu/firmware/50-edk2-ovmf-cc.json)" /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json > /tmp/50-edk2-ovmf-amdsev_.json && mv -f /tmp/50-edk2-ovmf-amdsev_.json /usr/share/qemu/firmware/50-edk2-ovmf-amdsev.json; fi
tcib_packages:
common:
- ceph-common

4
zuul.d/layout.yaml
View File

@ -10,7 +10,9 @@
- tripleo-undercloud-jobs-pipeline
- tripleo-buildimage-jobs
- tripleo-standalone-scenarios-pipeline
- tripleo-upgrades-master-pipeline
# TODO(cjeanner) uncomment this once this is in:
# https://review.opendev.org/q/I540c681687f5502aaa2e0b9d8b81b5fef83b2bc2
# - tripleo-upgrades-master-pipeline
vars:
ensure_global_symlinks: true
check: