Additional 2026.1 build config

mnasiadka · Alex-Welsh · commit 995aea4b66c9 · 2026-07-24T12:01:54.000+01:00
diff --git a/.automation b/.automation
@@ -1 +1 @@
-Subproject commit 54e4f814f51914318c597ed429b1887683bf86d4
+Subproject commit 0efe0cb91dfceca5c384194ac4df768ec198e023
diff --git a/.github/workflows/ipa-image-build.yml b/.github/workflows/ipa-image-build.yml
@@ -6,11 +6,11 @@ on:
       rocky9:
         description: Build Rocky Linux 9
         type: boolean
-        default: true
+        default: false
       rocky9-aarch64:
         description: Build Rocky Linux 9 aarch64
         type: boolean
-        default: true
+        default: false
       ubuntu-noble:
         description: Build Ubuntu 24.04 Noble
         type: boolean
diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
@@ -6,11 +6,11 @@ on:
       rocky9:
         description: Build Rocky Linux 9
         type: boolean
-        default: true
+        default: false
       rocky9-aarch64:
         description: Build Rocky Linux 9 aarch64
         type: boolean
-        default: true
+        default: false
       rocky10:
         description: Build Rocky Linux 10
         type: boolean
diff --git a/.github/workflows/overcloud-host-image-promote.yml b/.github/workflows/overcloud-host-image-promote.yml
@@ -6,7 +6,7 @@ on:
       rocky9:
         description: Promote Rocky Linux 9
         type: boolean
-        default: true
+        default: false
       rocky9-aarch64:
         description: Promote Rocky Linux 9 aarch64
         type: boolean
diff --git a/.github/workflows/overcloud-host-image-upload.yml b/.github/workflows/overcloud-host-image-upload.yml
@@ -6,7 +6,7 @@ on:
       rocky9:
         description: Upload Rocky Linux 9
         type: boolean
-        default: true
+        default: false
       rocky10:
         description: Upload Rocky Linux 10
         type: boolean
diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches:
       # NOTE(upgrade): Reference only the current release branch here.
-      - stackhpc/2025.1
+      - stackhpc/2026.1
 
   workflow_call:
     inputs:
@@ -24,7 +24,7 @@ on:
       base_image:
         type: string
         required: false
-        default: "rockylinux/rockylinux:9"
+        default: "rockylinux/rockylinux:10"
       if:
         description: Whether to run the workflow (workaround for required status checks issue)
         type: boolean
diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml
@@ -22,7 +22,7 @@ on:
         description: Build Rocky Linux 9 images?
         type: boolean
         required: false
-        default: true
+        default: false
       rocky-linux-10:
         description: Build Rocky Linux 10 images?
         type: boolean
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
@@ -4,6 +4,14 @@
 # where the key is the OS distro and the value is the tag to deploy.
 kolla_image_tags:
   openstack:
-    rocky-9: 2025.1-rocky-9-20260707T061355
-    rocky-10: 2025.1-rocky-10-20260707T061355
-    ubuntu-noble: 2025.1-ubuntu-noble-20260707T061355
+    rocky-10: 2026.1-rocky-10-20260701T090934
+    ubuntu-noble: 2026.1-ubuntu-noble-20260701T090934
+  bifrost:
+    rocky-10: 2026.1-rocky-10-20260625T132007
+    ubuntu-noble: 2026.1-ubuntu-noble-20260625T132007
+  nova:
+    rocky-10: 2026.1-rocky-10-20260702T080453
+    ubuntu-noble: 2026.1-ubuntu-noble-20260702T080453
+  prometheus:
+    rocky-10: 2026.1-rocky-10-20260702T080453
+    ubuntu-noble: 2026.1-ubuntu-noble-20260702T080453
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -169,19 +169,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/requirements.git
     reference: stackhpc/{{ openstack_release }}
-<<<<<<< HEAD
-  blazar-base:
-    type: git
-    location: https://github.com/stackhpc/blazar.git
-    reference: stackhpc/master
-  # TODO(technowhizz): Remove in 2026.1 on openstacksdk >= 4.9.0
-  # https://review.opendev.org/c/openstack/openstacksdk/+/970135
-  horizon:
-    type: git
-    location: https://github.com/stackhpc/horizon.git
-    reference: stackhpc/{{ openstack_release }}
-=======
->>>>>>> d48309fa (Add initial 2026.1 kolla build config)
 
 ###############################################################################
 # Kolla image build configuration.
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
@@ -2,31 +2,28 @@
 # This file is autogenerated by Ansible using the following workflow:
 # https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
 stackhpc_pulp_repo_almalinux_10_proxysql_3_0_version: 20260605T211649
-stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260506T232721
-stackhpc_pulp_repo_centos_stream_10_docker_version: 20260506T205129
+stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260620T010620
+stackhpc_pulp_repo_centos_stream_10_docker_version: 20260619T215327
 stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260603T233007
 stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260602T230909
-stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version: 20260227T222400
-stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version: 20260227T214730
-stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260220T152827
-stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260220T152827
+stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260603T233007
+stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260602T230909
 stackhpc_pulp_repo_doca_3_2_2_rhel10_aarch64_version: 20260326T091359
 stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version: 20260326T091359
-stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260506T205129
+stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260622T222357
 stackhpc_pulp_repo_elrepo_10_aarch64_version: 20260220T152827
-stackhpc_pulp_repo_elrepo_10_version: 20260426T213637
-stackhpc_pulp_repo_epel_10_aarch64_version: 20260505T223913
-stackhpc_pulp_repo_epel_10_version: 20260506T215737
+stackhpc_pulp_repo_elrepo_10_version: 20260620T002710
+stackhpc_pulp_repo_epel_10_aarch64_version: 20260624T000231
+stackhpc_pulp_repo_epel_10_version: 20260623T220913
 stackhpc_pulp_repo_ubuntu_noble_fluent_6_version: 20260615T110539
 stackhpc_pulp_repo_rhel_10_fluent_6_version: 20260327T202539
-stackhpc_pulp_repo_grafana_version: 20260618T211034
+stackhpc_pulp_repo_grafana_version: 20260623T210745
 stackhpc_pulp_repo_grafana_apt_version: 20260622T222446
 stackhpc_pulp_repo_opensearch_3_x_yum_version: 20260610T213138
 stackhpc_pulp_repo_opensearch_dashboards_3_x_yum_version: 20260610T213138
-stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20260112T224827
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20260112T224827
-stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20260423T205618
-stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260423T205618
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20260616T214234
+stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260616T214234
 stackhpc_pulp_repo_rhel_10_mariadb_11_4_aarch64_version: 20260527T210633
 stackhpc_pulp_repo_rhel_10_mariadb_11_4_version: 20260527T210633
 stackhpc_pulp_repo_rocky_10_2_appstream_aarch64_version: 20260620T010620
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
@@ -172,11 +172,10 @@ stackhpc_repo_rhel_10_fluent_6_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_rhel10_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/{{ stackhpc_pulp_rocky_10_doca_version }}/rhel10/$basearch/{{ stackhpc_repo_rhel10_doca_version }}"
 stackhpc_repo_rhel10_doca_version: "{{ stackhpc_repo_distribution }}"
 
-<<<<<<< HEAD
 # DOCA Modules for RHEL 10
 stackhpc_repo_rhel10_doca_modules_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca-modules/{{ stackhpc_pulp_rocky_10_doca_version }}/rhel10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}/$basearch/{{ stackhpc_repo_rhel10_doca_modules_version }}"
 stackhpc_repo_rhel10_doca_modules_version: "{{ stackhpc_repo_distribution }}"
-=======
+
 # OpenSearch for RHEL 10
 stackhpc_repo_opensearch_3_x_yum_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch/3.x/yum/{{ stackhpc_repo_opensearch_3_x_yum_version }}"
 stackhpc_repo_opensearch_3_x_yum_version: "{{ stackhpc_repo_distribution }}"
@@ -188,7 +187,6 @@ stackhpc_repo_opensearch_dashboards_3_x_yum_version: "{{ stackhpc_repo_distribut
 # Rocky 10 ProxySQL
 stackhpc_repo_almalinux_10_proxysql_3_0_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ProxySQL/proxysql-3.0.x/almalinux/10/{{ stackhpc_repo_almalinux_10_proxysql_3_0_version }}"
 stackhpc_repo_almalinux_10_proxysql_3_0_version: "{{ stackhpc_repo_distribution }}"
->>>>>>> d48309fa (Add initial 2026.1 kolla build config)
 
 ###############################################################################
 # Sources
@@ -200,11 +198,8 @@ stackhpc_kolla_source_version: 2026_1_backports
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-<<<<<<< HEAD
-stackhpc_kolla_ansible_source_version: stackhpc/20.4.0.10
-=======
+# FIXME: Merge cherry picks and revert to tag
 stackhpc_kolla_ansible_source_version: stackhpc/2026.1
->>>>>>> d48309fa (Add initial 2026.1 kolla build config)
 
 ###############################################################################
 # Container image registry
diff --git a/etc/kayobe/trivy/allowed-vulnerabilities.yml b/etc/kayobe/trivy/allowed-vulnerabilities.yml
@@ -12,101 +12,62 @@
 #
 # barbican_api_allowed_vulnerabilities:
 #   - CVE-2023-31047
+
+bifrost_base_allowed_vulnerabilities:
+  - CVE-2025-68121
+
+bifrost_deploy_allowed_vulnerabilities:
+  - CVE-2025-68121
+
 etcd_allowed_vulnerabilities:
-  - CVE-2026-33186
-fluentd_allowed_vulnerabilities:
-  - CVE-2024-27280
-  - CVE-2026-27820
-  - CVE-2026-44024
-  - CVE-2026-54906
-grafana_allowed_vulnerabilities:
-  - CVE-2024-8986
-  - CVE-2025-68121  # the opensearch datasource plugin is still vulnerable
-  - CVE-2026-33815
-  - CVE-2026-33816
-influxdb_allowed_vulnerabilities:
-  - CVE-2024-45337
   - CVE-2025-68121
   - CVE-2026-33186
-ironic_neutron_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
+
+fluentd_allowed_vulnerabilities:
+  - CVE-2026-42257
+  - CVE-2026-42258
+
 letsencrypt_lego_allowed_vulnerabilities:
   - CVE-2025-68121
   - CVE-2026-33186
-magnum_conductor_allowed_vulnerabilities:
-  - CVE-2024-45337
-  - CVE-2025-68121
-neutron_base_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_bgp_dragent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_dhcp_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_l3_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_linuxbridge_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_metadata_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_mlnx_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_openvswitch_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_ovn_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_server_allowed_vulnerabilities:
-  - CVE-2025-68121
-neutron_sriov_agent_allowed_vulnerabilities:
-  - CVE-2025-68121
-opensearch_allowed_vulnerabilities:
-  - CVE-2025-14813
-opensearch_dashboards_allowed_vulnerabilities:
-  - CVE-2025-68428
-  - CVE-2026-27699
-  - CVE-2026-31938
-  - CVE-2026-33937
+
 prometheus_alertmanager_allowed_vulnerabilities:
-  - CVE-2025-68121
+  - CVE-2026-33186
+
 prometheus_blackbox_exporter_allowed_vulnerabilities:
-  - CVE-2024-24790
-  - CVE-2024-45337
   - CVE-2025-68121
   - CVE-2026-33186
-prometheus_memcached_exporter_allowed_vulnerabilities:
-  - CVE-2024-45337
-  - CVE-2025-68121
-prometheus_mysqld_exporter_allowed_vulnerabilities:
-  - CVE-2024-45337
+
+prometheus_cadvisor_allowed_vulnerabilities:
   - CVE-2025-68121
+  - CVE-2026-33186
+
 prometheus_elasticsearch_exporter_allowed_vulnerabilities:
-  - CVE-2024-45337
   - CVE-2025-68121
-prometheus_node_exporter_allowed_vulnerabilities:
-  - CVE-2024-45337
+
+prometheus_libvirt_exporter_allowed_vulnerabilities:
   - CVE-2025-68121
-prometheus_openstack_exporter_allowed_vulnerabilities:
-  - CVE-2024-24790
-  - CVE-2024-45337
+
+prometheus_memcached_exporter_allowed_vulnerabilities:
   - CVE-2025-68121
-prometheus_ovn_exporter_allowed_vulnerabilities:
+
+prometheus_mtail_allowed_vulnerabilities:
   - CVE-2024-24790
   - CVE-2025-68121
-prometheus_libvirt_exporter_allowed_vulnerabilities:
-  - CVE-2024-45337
+  - CVE-2026-33186
+
+prometheus_mysqld_exporter_allowed_vulnerabilities:
   - CVE-2025-68121
-prometheus_cadvisor_allowed_vulnerabilities:
-  - CVE-2024-41110
-  - CVE-2024-45337
+
+prometheus_node_exporter_allowed_vulnerabilities:
   - CVE-2025-68121
-  - CVE-2026-33186
-prometheus_mtail_allowed_vulnerabilities:
+
+prometheus_openstack_exporter_allowed_vulnerabilities:
   - CVE-2024-24790
   - CVE-2025-68121
-  - CVE-2026-33186
-prometheus_server_allowed_vulnerabilities:
-  - CVE-2024-45337
+
+prometheus_openstack_network_exporter_allowed_vulnerabilities:
   - CVE-2025-68121
-  - CVE-2026-33186
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
