Update kolla build config for epoxy

Author: Alex-Welsh

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -56,6 +56,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/kolla.yml

@@ -134,24 +134,14 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/magnum.git
     reference: stackhpc/{{ openstack_release }}
-  neutron-base-plugin-networking-generic-switch:
-    type: git
-    location: https://github.com/stackhpc/networking-generic-switch.git
-    reference: stackhpc/{{ openstack_release }}
-  # FIXME: check whether we want to build from upstream master of a downstream
-  # 2025.1 branch e.g.
-  # location: https://github.com/stackhpc/networking-mlnx.git
-  # reference: stackhpc/{{ openstack_release }}
   neutron-server-plugin-networking-mlnx:
     type: git
-    location: https://opendev.org/x/networking-mlnx
-    reference: master
+    location: https://github.com/stackhpc/networking-mlnx.git
+    reference: stackhpc/{{ openstack_release }}
   nova-compute-plugin-networking-mlnx:
     type: git
-    location: https://opendev.org/x/networking-mlnx
-    reference: master
-  # FIXME: Check whether we want to build from downstream stackhpc/master,
-  # stackhpc/2025.1, or upstream epoxy or master
+    location: https://github.com/stackhpc/networking-mlnx.git
+    reference: stackhpc/{{ openstack_release }}
   blazar-base:
     type: git
     location: https://github.com/stackhpc/blazar.git
@@ -177,6 +167,9 @@ stackhpc_rocky_9_additional_repos:
   - url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
     tag: "centos-nfv-openvswitch"
+  - url: "{{ stackhpc_repo_centos_stream_9_openstack_epoxy_url }}"
+    file: "CentOS-OpenStack-epoxy.repo"
+    tag: "centos-openstack-epoxy"
   - url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
     file: "CentOS-OpsTools.repo"
     tag: "centos-opstools"

etc/kayobe/pulp-repo-versions.yml

@@ -1,23 +1,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_centos_stream_9_docker_version: 20250123T000657
-stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250205T015600
+stackhpc_pulp_repo_centos_stream_9_docker_version: 20250423T095148
+stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250521T021940
+stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version: 20250521T021940
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
-stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250203T100829
-stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250131T133101
-stackhpc_pulp_repo_elrepo_9_version: 20250203T000038
-stackhpc_pulp_repo_epel_9_version: 20250204T071808
-stackhpc_pulp_repo_grafana_version: 20250204T090817
-stackhpc_pulp_repo_opensearch_2_x_version: 20241106T010702
-stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20241106T010702
-stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250128T001826
-stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
-stackhpc_pulp_repo_rhel_9_influxdb_version: 20250125T002237
-stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250205T001351
+stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250412T024303
+stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250520T001722
+stackhpc_pulp_repo_elrepo_9_version: 20250520T000105
+stackhpc_pulp_repo_epel_9_version: 20250521T000033
+stackhpc_pulp_repo_grafana_version: 20250520T005212
+stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
+stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250510T003301
+stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250415T235053
+stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
+stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
+stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
+stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
+stackhpc_pulp_repo_rhel_9_influxdb_version: 20250520T003433
+stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250510T003301
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
-stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241115T002028
+stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20250516T002449
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
@@ -38,16 +43,12 @@ stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
 stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
 stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
 stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
-stackhpc_pulp_repo_rocky_9_5_appstream_version: 20250202T120931
-stackhpc_pulp_repo_rocky_9_5_baseos_version: 20250201T125442
-stackhpc_pulp_repo_rocky_9_5_crb_version: 20250204T095037
-stackhpc_pulp_repo_rocky_9_5_extras_version: 20250122T025402
-stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20250204T095037
-stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250128T024400
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250205T050034
-stackhpc_pulp_repo_ubuntu_noble_security_version: 20250205T090140
-stackhpc_pulp_repo_ubuntu_noble_version: 20250205T090140
-stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
-stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
-stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
-stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
+stackhpc_pulp_repo_rocky_9_5_appstream_version: 20250514T014704
+stackhpc_pulp_repo_rocky_9_5_baseos_version: 20250513T031844
+stackhpc_pulp_repo_rocky_9_5_crb_version: 20250514T014704
+stackhpc_pulp_repo_rocky_9_5_extras_version: 20250506T032818
+stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20250426T024332
+stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250222T040303
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250521T051707
+stackhpc_pulp_repo_ubuntu_noble_security_version: 20250521T092424
+stackhpc_pulp_repo_ubuntu_noble_version: 20250521T092424

etc/kayobe/pulp.yml

@@ -285,6 +285,12 @@ stackhpc_pulp_rpm_repos:
     base_path: "centos/9-stream/nfv/x86_64/openvswitch-2/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
+  - name: CentOS Stream 9 - OpenStack Epoxy
+    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
+    distribution_name: "centos-stream-9-openstack-epoxy-"
+    base_path: "centos/9-stream/cloud/x86_64/openstack-epoxy/"
+    required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
+
   - name: CentOS 9 - OpsTools - collectd
     url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
     distribution_name: "centos-9-opstools-collectd-"

etc/kayobe/stackhpc.yml

@@ -68,6 +68,10 @@ stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 
+# CentOS Stream 9 - OpenStack Epoxy
+stackhpc_repo_centos_stream_9_openstack_epoxy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_repo_centos_stream_9_openstack_epoxy_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_repo_distribution }}"
+
 # CentOS Stream 9 - NFV OpenvSwitch
 stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"