From 042934dedf444b8641caf531551629fbbc482e71 Mon Sep 17 00:00:00 2001 From: Alex Welsh Date: Wed, 29 Jul 2026 16:10:44 +0100 Subject: [PATCH 1/2] Find & replace 2025.1 for 2026.1 --- .github/workflows/multinode-inputs.py | 2 +- .github/workflows/stackhpc-multinode.yml | 2 +- .github/workflows/stackhpc-promote.yml | 2 +- .github/workflows/stackhpc-update-kolla.yml | 1 + .../trigger-overcloud-host-image-build.yml | 2 +- .github/workflows/update-dependencies.yml | 4 ++-- .../workflows/update-overcloud-host-image-tags.yml | 2 +- README.rst | 4 ++-- doc/source/contributor/environments/aio.rst | 6 +++--- etc/kayobe/environments/aio/automated-setup.sh | 2 +- etc/kayobe/environments/aio/release-train.yml | 1 - .../aufn-ceph/a-universe-from-nothing.sh | 4 ++-- .../environments/ci-builder/builder-apt-preferences | 10 ---------- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 - .../environments/ci-multinode/stackhpc-ci.yml | 1 - .../environments/ci-tenks/automated-deployment.sh | 4 ++-- etc/kayobe/pulp.yml | 13 ------------- etc/kayobe/stackhpc.yml | 4 ---- tox.ini | 4 ++-- 19 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 etc/kayobe/environments/ci-builder/builder-apt-preferences diff --git a/.github/workflows/multinode-inputs.py b/.github/workflows/multinode-inputs.py index 698270f9e4..911fa38a3f 100644 --- a/.github/workflows/multinode-inputs.py +++ b/.github/workflows/multinode-inputs.py @@ -84,7 +84,7 @@ def get_branch(version: str) -> str: def get_tkm_version(version: str) -> str: - if version == "2025.1": + if version in ["2025.1", "2026.1"]: return "main" else: return get_branch(version) diff --git a/.github/workflows/stackhpc-multinode.yml b/.github/workflows/stackhpc-multinode.yml index 10e6690928..8833d0264c 100644 --- a/.github/workflows/stackhpc-multinode.yml +++ b/.github/workflows/stackhpc-multinode.yml @@ -110,7 +110,7 @@ jobs: ssh_keys: ${{ needs.github_user_ssh_keys.outputs.ssh_keys }} stackhpc_kayobe_config_version: ${{ github.ref_name }} # NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here. - stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }} + stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2025.1' || 'stackhpc/2026.1' }} terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }} terraform_kayobe_multinode_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'main' }} multinode_controller_count: ${{ inputs.small_cluster && 1 || 3 }} diff --git a/.github/workflows/stackhpc-promote.yml b/.github/workflows/stackhpc-promote.yml index 79a8bbbdae..bc6d245c26 100644 --- a/.github/workflows/stackhpc-promote.yml +++ b/.github/workflows/stackhpc-promote.yml @@ -4,7 +4,7 @@ on: push: branches: # NOTE(upgrade): Reference only the current release branch here. - - stackhpc/2025.1 + - stackhpc/2026.1 jobs: promote: name: Trigger Pulp promotion workflows diff --git a/.github/workflows/stackhpc-update-kolla.yml b/.github/workflows/stackhpc-update-kolla.yml index 5b1988cb1f..7ff15e4271 100644 --- a/.github/workflows/stackhpc-update-kolla.yml +++ b/.github/workflows/stackhpc-update-kolla.yml @@ -16,6 +16,7 @@ jobs: - version: stackhpc/2023.1 - version: stackhpc/2024.1 - version: stackhpc/2025.1 + - version: stackhpc/2026.1 uses: ./.github/workflows/update-dependencies.yml with: branch: ${{ matrix.version }} diff --git a/.github/workflows/trigger-overcloud-host-image-build.yml b/.github/workflows/trigger-overcloud-host-image-build.yml index 4db1cd5cad..131d096739 100644 --- a/.github/workflows/trigger-overcloud-host-image-build.yml +++ b/.github/workflows/trigger-overcloud-host-image-build.yml @@ -3,7 +3,7 @@ name: Trigger overcloud host image build on: push: branches: - - stackhpc/2025.1 + - stackhpc/2026.1 jobs: check-changes: diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 14601a1c9b..e1abe7798c 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -4,13 +4,13 @@ on: workflow_call: inputs: branch: - description: Branch to update. Must exist in all repositories. e.g. stackhpc/2025.1 + description: Branch to update. Must exist in all repositories. e.g. stackhpc/2026.1 type: string required: true workflow_dispatch: inputs: branch: - description: Branch to update. Must exist in all repositories. e.g. stackhpc/2025.1 + description: Branch to update. Must exist in all repositories. e.g. stackhpc/2026.1 type: string required: true diff --git a/.github/workflows/update-overcloud-host-image-tags.yml b/.github/workflows/update-overcloud-host-image-tags.yml index 92ca16f186..4386f1db3f 100644 --- a/.github/workflows/update-overcloud-host-image-tags.yml +++ b/.github/workflows/update-overcloud-host-image-tags.yml @@ -32,7 +32,7 @@ jobs: - name: Checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: - ref: stackhpc/2025.1 + ref: stackhpc/2026.1 path: ${{ github.workspace }}/src/kayobe-config - name: Update Rocky 9 overcloud host image tag diff --git a/README.rst b/README.rst index 48505277fc..8225ff43da 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ StackHPC Kayobe Configuration ============================= -This repository provides a base Kayobe configuration for the 2025.1 Epoxy +This repository provides a base Kayobe configuration for the 2026.1 Gazpacho release of StackHPC OpenStack. **Note: This repository is maintained for StackHPC and its customers. While it @@ -10,7 +10,7 @@ is not intended for direct external deployment, specific OpenStack configuration elements may be extracted or adapted for your own use.** Documentation is hosted on `readthedocs.io -`__, +`__, and includes release notes. Kayobe diff --git a/doc/source/contributor/environments/aio.rst b/doc/source/contributor/environments/aio.rst index 3cf752e7ae..754a455704 100644 --- a/doc/source/contributor/environments/aio.rst +++ b/doc/source/contributor/environments/aio.rst @@ -30,7 +30,7 @@ Download the setup script: .. parsed-literal:: - curl -LO https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2025.1/etc/kayobe/environments/aio/automated-setup.sh + curl -LO https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2026.1/etc/kayobe/environments/aio/automated-setup.sh Change the permissions on the script: @@ -62,9 +62,9 @@ following options: * ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must exist before running the script. -* ``KAYOBE_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of Kayobe +* ``KAYOBE_BRANCH`` (default: ``stackhpc/2026.1``) - The branch of Kayobe source code to use. -* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2025.1``) - The branch of +* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2026.1``) - The branch of ``stackhpc-kayobe-config`` to use. * ``KAYOBE_AIO_LVM`` (default: ``true``) - Whether the image uses LVM. * ``KAYOBE_CONFIG_EDIT_PAUSE`` (default: ``false``) - Option to pause diff --git a/etc/kayobe/environments/aio/automated-setup.sh b/etc/kayobe/environments/aio/automated-setup.sh index 9f572d860b..38894fd273 100755 --- a/etc/kayobe/environments/aio/automated-setup.sh +++ b/etc/kayobe/environments/aio/automated-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash BASE_PATH=~ -OPENSTACK_RELEASE=2025.1 +OPENSTACK_RELEASE=2026.1 KAYOBE_BRANCH=stackhpc/$OPENSTACK_RELEASE KAYOBE_CONFIG_BRANCH=stackhpc/$OPENSTACK_RELEASE KAYOBE_AIO_LVM=true diff --git a/etc/kayobe/environments/aio/release-train.yml b/etc/kayobe/environments/aio/release-train.yml index 91ab1cf0b3..f301dabeed 100644 --- a/etc/kayobe/environments/aio/release-train.yml +++ b/etc/kayobe/environments/aio/release-train.yml @@ -29,7 +29,6 @@ stackhpc_repo_mirror_password: "{{ stackhpc_release_pulp_password }}" stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}" stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}" stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}" stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}" stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh index 9b79d4a4af..86c664f090 100755 --- a/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh +++ b/etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh @@ -10,8 +10,8 @@ set -eu BASE_PATH=~ -KAYOBE_BRANCH=stackhpc/2025.1 -KAYOBE_CONFIG_BRANCH=stackhpc/2025.1 +KAYOBE_BRANCH=stackhpc/2026.1 +KAYOBE_CONFIG_BRANCH=stackhpc/2026.1 KAYOBE_ENVIRONMENT=aufn-ceph if [[ ! -f $BASE_PATH/vault-pw ]]; then diff --git a/etc/kayobe/environments/ci-builder/builder-apt-preferences b/etc/kayobe/environments/ci-builder/builder-apt-preferences deleted file mode 100644 index dcce95df9f..0000000000 --- a/etc/kayobe/environments/ci-builder/builder-apt-preferences +++ /dev/null @@ -1,10 +0,0 @@ -# Custom APT preferences for Ubuntu-based kolla container image builds -# Pin openvswitch packages to 3.3 (latest LTS release) -Package: openvswitch-* python3-openvswitch -Pin: version 3.3.* -Pin-Priority: 1001 - -# Pin OVN packages to 24.03 (latest LTS release) -Package: ovn-* -Pin: version 24.03.* -Pin-Priority: 1001 diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 3afa158fae..1a33909241 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -56,7 +56,6 @@ stackhpc_repo_mirror_password: !vault | stackhpc_repo_almalinux_10_proxysql_3_0_version: "{{ stackhpc_pulp_repo_almalinux_10_proxysql_3_0_version }}" stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}" stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}" stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}" stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml index 3fea498e19..9a00f46fea 100644 --- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml @@ -27,7 +27,6 @@ stackhpc_repo_mirror_password: !vault | stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}" stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}" stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}" stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}" stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/environments/ci-tenks/automated-deployment.sh b/etc/kayobe/environments/ci-tenks/automated-deployment.sh index f96ce3ca6c..ce21626039 100755 --- a/etc/kayobe/environments/ci-tenks/automated-deployment.sh +++ b/etc/kayobe/environments/ci-tenks/automated-deployment.sh @@ -10,8 +10,8 @@ set -eux BASE_PATH=~ -KAYOBE_BRANCH=stackhpc/2025.1 -KAYOBE_CONFIG_REF=${KAYOBE_CONFIG_REF:-stackhpc/2025.1} +KAYOBE_BRANCH=stackhpc/2026.1 +KAYOBE_CONFIG_REF=${KAYOBE_CONFIG_REF:-stackhpc/2026.1} KAYOBE_ENVIRONMENT=${KAYOBE_ENVIRONMENT:-ci-tenks} if [[ ! -f $BASE_PATH/vault-pw ]]; then diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 6d385e4d8f..7a0b34675c 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -248,7 +248,6 @@ stackhpc_pulp_repo_rocky_10_security_aarch64_version: "{{ lookup('vars', 'stackh # Rocky 10 Multiarch repositories stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch' ~ arch_suffix ~ '_version') }}" -stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_openstack_epoxy' ~ arch_suffix ~ '_version') }}" stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_ovn_lts' ~ arch_suffix ~ '_version') }}" stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid' ~ arch_suffix ~ '_version') }}" stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_docker' ~ arch_suffix ~ '_version') }}" @@ -360,18 +359,6 @@ stackhpc_pulp_rpm_repos: base_path: "centos/10-stream/nfv/aarch64/openvswitch-2/" required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}" - - name: CentOS Stream 10 - OpenStack Epoxy - url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version }}" - distribution_name: "centos-stream-10-openstack-epoxy-" - base_path: "centos/10-stream/cloud/x86_64/openstack-epoxy/" - required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'x86_64' in stackhpc_pulp_rpm_architectures }}" - - - name: CentOS Stream 10 - OpenStack Epoxy - aarch64 - url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/cloud/aarch64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version }}" - distribution_name: "centos-stream-10-openstack-epoxy-aarch64-" - base_path: "centos/10-stream/cloud/aarch64/openstack-epoxy/" - required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}" - - name: CentOS Stream 10 - Ceph Squid url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/storage/x86_64/ceph-squid/{{ stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version }}" distribution_name: "centos-stream-10-ceph-squid-" diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 21fdef8121..5d0ed23d4e 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -140,10 +140,6 @@ stackhpc_repo_rocky_10_security_version: "{{ stackhpc_repo_distribution }}" stackhpc_repo_centos_stream_10_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/nfv/$basearch/openvswitch-2/{{ stackhpc_repo_centos_stream_10_nfv_openvswitch_version }}" stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}" -# CentOS Stream 10 - OVN/OVS LTS for Epoxy -stackhpc_repo_centos_stream_10_ovn_lts_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/ovn/{{ kolla_base_arch }}/ovn-lts/{{ stackhpc_repo_centos_stream_10_ovn_lts_version }}" -stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_repo_distribution }}" - # CentOS Stream 10 - Ceph Squid stackhpc_repo_centos_stream_10_storage_ceph_squid_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/storage/$basearch/ceph-squid/{{ stackhpc_repo_centos_stream_10_storage_ceph_squid_version }}" stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_repo_distribution }}" diff --git a/tox.ini b/tox.ini index cc539d8572..b492f2c7fc 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ commands = allowlist_externals = rm skip_install = true deps = - -c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2025.1/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2026.1/upper-constraints.txt} -r{toxinidir}/releasenotes/requirements.txt commands = rm -rf releasenotes/build/html @@ -30,7 +30,7 @@ commands = allowlist_externals = rm skip_install = true deps = - -c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2025.1/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/2026.1/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build/html From 4fc19a6c9cdb6bb33b4dc5a6dcbb037c02e9e93d Mon Sep 17 00:00:00 2001 From: Alex Welsh Date: Wed, 29 Jul 2026 16:27:52 +0100 Subject: [PATCH 2/2] Remove myst-parser dependency in docs --- doc/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 07e07868b2..653b68a4e3 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,9 +1,6 @@ -# TODO(priteau): Remove myst-parser dependency and bump Sphinx once -# compatibility is resolved -myst-parser>=4.0.0,<5 # MIT reno>=3.4.0 # Apache-2.0 sphinx-copybutton # MIT sphinx-substitution-extensions # MIT -sphinx>=4.2.0,<9 # BSD +sphinx>=8,<9 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD sphinx-immaterial # MIT