From edbcdd02a90d7c05001c2a9edb98ee1a903d3222 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Thu, 26 Jun 2025 09:28:19 +0100 Subject: [PATCH] Fix metadata agent, re-enable OVS upgrade CI --- .github/workflows/stackhpc-pull-request.yml | 35 ++++++++++----------- etc/kayobe/kolla-image-tags.yml | 3 ++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index 25d142107..5d71d0f74 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -219,21 +219,20 @@ jobs: secrets: inherit if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - # FIXME: Disabled until https://bugs.launchpad.net/neutron/+bug/2112492 gets resolved - # all-in-one-upgrade-rocky-9-ovs: - # name: aio upgrade (Rocky 9 OVS) - # needs: - # - check-changes - # - build-kayobe-image - # uses: ./.github/workflows/stackhpc-all-in-one.yml - # with: - # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }} - # os_distribution: rocky - # os_release: "9" - # ssh_username: cloud-user - # neutron_plugin: ovs - # OS_CLOUD: openstack - # if: ${{ needs.check-changes.outputs.aio == 'true' }} - # upgrade: true - # secrets: inherit - # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} + all-in-one-upgrade-rocky-9-ovs: + name: aio upgrade (Rocky 9 OVS) + needs: + - check-changes + - build-kayobe-image + uses: ./.github/workflows/stackhpc-all-in-one.yml + with: + kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }} + os_distribution: rocky + os_release: "9" + ssh_username: cloud-user + neutron_plugin: ovs + OS_CLOUD: openstack + if: ${{ needs.check-changes.outputs.aio == 'true' }} + upgrade: true + secrets: inherit + if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 77b8a8740..b0d065681 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -6,3 +6,6 @@ kolla_image_tags: openstack: rocky-9: 2025.1-rocky-9-20250616T133037 ubuntu-noble: 2025.1-ubuntu-noble-20250613T131221 + neutron_metadata_agent: + rocky-9: 2025.1-rocky-9-20250626T074649 + ubuntu-noble: 2025.1-ubuntu-noble-20250626T074649