Merge branch 'epoxy-image-build-test' into epoxy-9.6

Author: Alex-Welsh

etc/kayobe/environments/ci-builder/builder-apt-preferences

@@ -0,0 +1,10 @@
+# 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

etc/kayobe/kolla-image-tags.yml

@@ -2,8 +2,7 @@
 # Dict of Kolla image tags to deploy for each service.
 # Each key is the tag variable prefix name, and the value is another dict,
 # where the key is the OS distro and the value is the tag to deploy.
-# TODO: Rebuild epoxy images
 kolla_image_tags:
   openstack:
-    rocky-9: 2025.1-rocky-9-20250611T085217
-    ubuntu-noble: 2025.1-ubuntu-noble-20250611T085217
+    rocky-9: 2025.1-rocky-9-20250613T131221
+    ubuntu-noble: 2025.1-ubuntu-noble-20250613T131221

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
@@ -360,7 +350,6 @@ kolla_build_customizations_common:
     - python3-ethtool
   neutron_mlnx_agent_pip_packages_override:
     - networking-mlnx@git+https://opendev.org/x/networking-mlnx@master
-
 kolla_build_customizations_rocky:
   base_centos_yum_repo_packages_append:
     - centos-release-ceph-squid
@@ -369,6 +358,10 @@ kolla_build_customizations_rocky:
   base_centos_yum_repos_to_disable_remove:
     - centos-ceph-reef
     - epel
+    - centos9-nfv-ovs
+    - centos9-opstools
+    - centos9-rabbitmq
+    - centos9-storage
   kolla_toolbox_packages_remove:
     - openvswitch
   kolla_toolbox_packages_append:
@@ -389,6 +382,8 @@ kolla_build_customizations_rocky:
   nova_base_packages_append:
     - openvswitch3.3
     - python3-openvswitch3.3
+  nova_libvirt_packages_remove:
+    - openvswitch
   octavia_base_packages_remove:
     - python3-openvswitch
   openvswitch_base_packages_remove:

etc/kayobe/kolla/kolla-build.conf

@@ -4,9 +4,12 @@
 {# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
 {% if kolla_base_distro == 'ubuntu' %}
 base_tag = noble-20241118.1
+apt_preferences = {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/environments/ci-builder/builder-apt-preferences
 {# 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 }}
+# NOTE(Alex-Welsh): rpm_setup_config is intentionally left blank to override defaults
+rpm_setup_config = 
 {% endif %}
 build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | join(',') }}
 

etc/kayobe/stackhpc.yml

@@ -141,7 +141,7 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/20.0.0.3
+stackhpc_kolla_source_version: stackhpc/20.0.0.12
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

releasenotes/notes/ovs-3.3-46e7e524eabe0246.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    OpenvSwitch has been pinned to the latest LTS release (3.3) in Ubuntu
+    Noble container images.

releasenotes/notes/ubuntu-ovn-pin-24.03-62ec80fe8cced318.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    OVN has been pinned to the latest LTS release (24.03) in Ubuntu
+    Noble container images.