Merge pull request #2442 from stackhpc/sync-2025.1

2026.1 - Sync changes from stackhpc/2025.1

Author: Alex-Welsh

.automation.conf/tempest/tempest-aio.overrides.conf

@@ -0,0 +1,2 @@
+[volume]
+catalog_type = volumev3

.automation.conf/tempest/tempest-ci-aio.overrides.conf

@@ -0,0 +1 @@
+tempest-aio.overrides.conf

.automation.conf/tempest/tempest-ci-aio.overrides.conf

@@ -16,6 +16,7 @@ aio: &aio
   - 'etc/kayobe/ansible/requirements.yml'
   - 'etc/kayobe/ansible/scripts/aio-init.sh'
   - 'etc/kayobe/environments/ci-aio/**'
+  - 'etc/kayobe/environments/aio/**'
   - 'etc/kayobe/inventory/**'
   - 'etc/kayobe/kolla/**'
   - 'kayobe-env'

.github/stackhpc-pull-request-path-filters.yml

@@ -31,16 +31,16 @@ class Scenario:
 
 
 ROCKY_9 = OSRelease("rocky", "9", "cloud-user")
+ROCKY_10 = OSRelease("rocky", "10", "cloud-user")
 UBUNTU_JAMMY = OSRelease("ubuntu", "jammy", "ubuntu")
 UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
 # NOTE(upgrade): Add supported releases here.
 OPENSTACK_RELEASES = [
-    OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
+    OpenStackRelease("2024.1", "", [ROCKY_9, UBUNTU_JAMMY]),
     OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
+    OpenStackRelease("2025.1", "", [ROCKY_10]),
 ]
 NEUTRON_PLUGINS = ["ovs", "ovn"]
-VERSION_HIERARCHY = ["2023.1", "2024.1", "2025.1"]
-
 
 def main() -> None:
 
@@ -75,12 +75,12 @@ def random_scenario() -> Scenario:
     openstack_release = random.choice(OPENSTACK_RELEASES)
     os_release = random.choice(openstack_release.os_releases)
     neutron_plugin = random.choice(NEUTRON_PLUGINS)
-    upgrade = "major" if random.random() > 0.6 else "none"
+    upgrade = "major" if (random.random() > 0.6 and openstack_release.previous_version != "") else "none"
     return Scenario(openstack_release, os_release, neutron_plugin, upgrade)
 
 
 def get_branch(version: str) -> str:
-    return f"stackhpc/{version}"
+    return f"stackhpc/{version}" if version != "" else ""
 
 
 def get_tkm_version(version: str) -> str:

.github/workflows/multinode-inputs.py

@@ -10,15 +10,15 @@ on:
       rocky9-aarch64:
         description: Promote Rocky Linux 9 aarch64
         type: boolean
-        default: false
+        default: true
       rocky10:
         description: Promote Rocky Linux 10
         type: boolean
         default: true
       rocky10-aarch64:
         description: Promote Rocky Linux 10 aarch64
         type: boolean
-        default: false
+        default: true
       ubuntu-noble:
         description: Promote Ubuntu 24.04 Noble
         type: boolean