From 1328e2f923f14ee80098c6a12d4504ca528a7542 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 13 Sep 2024 09:46:21 +0100 Subject: [PATCH 1/8] Rebuild Ubuntu Kolla images for Caracal --- etc/kayobe/kolla-image-tags.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 8f85eef15..53398f030 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -5,10 +5,9 @@ kolla_image_tags: openstack: rocky-9: 2024.1-rocky-9-20240903T113235 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045 + ubuntu-jammy: 2024.1-ubuntu-jammy-20240912T142033 heat: rocky-9: 2024.1-rocky-9-20240805T142526 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526 nova: rocky-9: 2024.1-rocky-9-20240918T164436 ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 @@ -20,11 +19,9 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240909T144917 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: rocky-9: 2024.1-rocky-9-20240910T072617 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240910T072617 rabbitmq: rocky-9: 2024.1-rocky-9-20240927T152945 From e7540e80e4ecedddf020f62c5ea291866ff82a0a Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 13 Sep 2024 09:49:36 +0100 Subject: [PATCH 2/8] Rebuild rocky linux ironic images for Caracal --- etc/kayobe/kolla-image-tags.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 53398f030..739145fe9 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -19,6 +19,8 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 + ironic: + rocky-9: 2024.1-rocky-9-20240913T082332 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: From 15c579259f6773287856100a105bfba71c045ed0 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 17 Sep 2024 10:13:06 +0100 Subject: [PATCH 3/8] Update Ubuntu base image for container build --- etc/kayobe/kolla/kolla-build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf index 88f3d3164..96699c2f7 100644 --- a/etc/kayobe/kolla/kolla-build.conf +++ b/etc/kayobe/kolla/kolla-build.conf @@ -3,7 +3,7 @@ {# snapshots, so pin to a specific tag. #} {# This tag should be updated when Ubuntu package repo snapshot versions are changed. #} {% if kolla_base_distro == 'ubuntu' %} -base_tag = jammy-20231004 +base_tag = jammy-20240808 {# Similarly pinning to Rocky 9 minor version used in our repos #} {% elif kolla_base_distro == 'rocky' %} base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }} From dd16ccb5faa842f12b8e3bd047d7daab7864413e Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 17 Sep 2024 16:02:42 +0100 Subject: [PATCH 4/8] Build Caracal kolla images with correct ubuntu base image --- etc/kayobe/kolla-image-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 739145fe9..f549385e7 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -5,7 +5,7 @@ kolla_image_tags: openstack: rocky-9: 2024.1-rocky-9-20240903T113235 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240912T142033 + ubuntu-jammy: 2024.1-ubuntu-jammy-20240917T091559 heat: rocky-9: 2024.1-rocky-9-20240805T142526 nova: From 6e3a64c68d42a2ee70a7d766f200b8d5dd79fae8 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 4 Oct 2024 18:41:43 +0100 Subject: [PATCH 5/8] Bump nova, neutron and octavia tags --- etc/kayobe/kolla-image-tags.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index f549385e7..5450b4291 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -9,14 +9,14 @@ kolla_image_tags: heat: rocky-9: 2024.1-rocky-9-20240805T142526 nova: - rocky-9: 2024.1-rocky-9-20240918T164436 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 neutron: - rocky-9: 2024.1-rocky-9-20240918T164436 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 octavia: - rocky-9: 2024.1-rocky-9-20240926T144142 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 ironic: From 2eb60bea41c74bdaf44aad7779171848c6bfb45d Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 7 Oct 2024 09:29:59 +0100 Subject: [PATCH 6/8] Bump Ironic tag I also built dnsmasq. The lack of which was causing jobs to fail. --- etc/kayobe/kolla-image-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 5450b4291..e496b0667 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -20,7 +20,7 @@ kolla_image_tags: horizon: rocky-9: 2024.1-rocky-9-20240909T144917 ironic: - rocky-9: 2024.1-rocky-9-20240913T082332 + rocky-9: 2024.1-rocky-9-20241004T183935 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: From 26a6f02c309bf44eeed153382abbe2e51a1b8bd2 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 11 Oct 2024 10:43:18 +0100 Subject: [PATCH 7/8] [2023.1] Fix eswitchd and neutron_mlnx_agent not using our fork The neutron_mlnx_agent based containers are not using the neutron plugins, so we need to customize the pip package directly. --- etc/kayobe/kolla.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1e551b814..00ffa169b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -360,6 +360,8 @@ kolla_build_customizations_common: nova_compute_packages_append: - python3-libvirt - python3-ethtool + neutron_mlnx_agent_pip_packages_override: + - networking-mlnx@git+https://github.com/stackhpc/networking-mlnx@stackhpc/{{ openstack_release }} kolla_build_customizations_rocky: kolla_toolbox_packages_remove: From da2628e8d81005b66a501e66bb9f2fcb001bfb71 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 30 Oct 2024 14:01:55 +0000 Subject: [PATCH 8/8] DNM: test bumping disk --- .github/workflows/stackhpc-all-in-one.yml | 2 +- .github/workflows/stackhpc-pull-request.yml | 88 --------------------- 2 files changed, 1 insertion(+), 89 deletions(-) diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml index 36a1ea99c..0e98113f7 100644 --- a/.github/workflows/stackhpc-all-in-one.yml +++ b/.github/workflows/stackhpc-all-in-one.yml @@ -167,7 +167,7 @@ jobs: VM_NETWORK: ${{ inputs.vm_network }} VM_SUBNET: ${{ inputs.vm_subnet }} VM_INTERFACE: ${{ inputs.vm_interface }} - VM_VOLUME_SIZE: ${{ inputs.upgrade && '55' || '40' }} + VM_VOLUME_SIZE: ${{ inputs.upgrade && '65' || '50' }} VM_TAGS: '["skc-ci-aio", "PR=${{ github.event.number }}"]' - name: Terraform Plan diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index aba6bacb7..ab56c89bc 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -90,94 +90,6 @@ jobs: secrets: inherit if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - all-in-one-ubuntu-jammy-ovs: - name: aio (Ubuntu Jammy 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: ubuntu - os_release: jammy - ssh_username: ubuntu - neutron_plugin: ovs - OS_CLOUD: openstack - if: ${{ needs.check-changes.outputs.aio == 'true' }} - secrets: inherit - if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - all-in-one-ubuntu-jammy-ovn: - name: aio (Ubuntu Jammy OVN) - 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: ubuntu - os_release: jammy - ssh_username: ubuntu - neutron_plugin: ovn - OS_CLOUD: openstack - if: ${{ needs.check-changes.outputs.aio == 'true' }} - secrets: inherit - if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - all-in-one-rocky-9-ovs: - name: aio (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' }} - secrets: inherit - if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - all-in-one-rocky-9-ovn: - name: aio (Rocky 9 OVN) - 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: ovn - OS_CLOUD: openstack - if: ${{ needs.check-changes.outputs.aio == 'true' }} - secrets: inherit - if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }} - - # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN. - - all-in-one-upgrade-ubuntu-jammy-ovs: - name: aio upgrade (Ubuntu Jammy 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: ubuntu - os_release: jammy - ssh_username: ubuntu - 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-ovn: name: aio upgrade (Rocky 9 OVN) needs: