From 08a2c52d61faa01eef620aa258f45a688dfacd8d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 15 Mar 2023 16:22:35 +0100 Subject: [PATCH] Upgrade from 2023.1 and use Jammy for the upgrade job But add the jammy shimx64.efi.signed fix also to focal. Change-Id: Ib357e967ec1c2820bf23b52fbb3e95528454afb3 --- .../defaults/required_defaults_Debian_family.yml | 2 +- zuul.d/bifrost-jobs.yaml | 7 +++---- zuul.d/project.yaml | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml index 6fcd0c77c..fe7153038 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml @@ -9,7 +9,7 @@ efi_distro: "{{ ansible_facts['distribution'] | lower }}" grub_efi_package: grub-efi-amd64-signed grub_efi_binary: /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed shim_efi_package: shim-signed -shim_efi_binary: "/usr/lib/shim/shimx64.efi.signed{{ '.latest' if ansible_distribution_release == 'jammy' else '' }}" +shim_efi_binary: "/usr/lib/shim/shimx64.efi.signed{{ '.latest' if ansible_distribution == 'Ubuntu' else '' }}" required_packages: - mariadb-server - python3-dev diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index e82ba72a8..57484bdd0 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -190,15 +190,14 @@ run: playbooks/ci/upgrade.yaml timeout: 9600 vars: - upgrade_from: stable/zed + upgrade_from: stable/2023.1 skip_upgrade: - openstack/diskimage-builder -# NOTE(rpittau): convert to jammy after antelope - job: - name: bifrost-upgrade-ubuntu-focal + name: bifrost-upgrade-ubuntu-jammy parent: bifrost-upgrade - nodeset: ubuntu-focal + nodeset: ubuntu-jammy - job: name: bifrost-upgrade-keystone-centos9 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8981708d2..934679897 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -14,7 +14,7 @@ - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-centos-9 - - bifrost-upgrade-ubuntu-focal + - bifrost-upgrade-ubuntu-jammy - bifrost-upgrade-keystone-centos9 # Non-voting jobs - bifrost-integration-tinyipa-keystone-ubuntu-focal: @@ -64,7 +64,7 @@ - bifrost-integration-tinyipa-debian-bullseye - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-centos-9 - - bifrost-upgrade-ubuntu-focal + - bifrost-upgrade-ubuntu-jammy - bifrost-upgrade-keystone-centos9 experimental: jobs: