splitting build customizations

Author: owenjones

etc/kayobe/kolla.yml

@@ -393,14 +393,14 @@ kolla_build_blocks:
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}; \
     fi{% if not loop.last %} &&{% endif %} \
     {% endfor %}
-        # NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
-        # (see rdo-openvswitch.spec obsolete_ovn_versions:
-        # https://git.centos.org/rpms/rdo-openvswitch/blob/c9s-sig-cloud-openstack-epoxy/f/SPECS/rdo-openvswitch.spec#L10),
-        # which would replace our NFV OVS and OVN 24.03 LTS with 24.09. Hence exclude RDO OVN/OVS.
-        && \
-        if [ -f /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo ]; then \
-          sed -i '/^\[centos-openstack-epoxy\]/a excludepkgs=*rdo-ovn*,*rdo-openvswitch*' /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo; \
-        fi \
+    # NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
+    # (see rdo-openvswitch.spec obsolete_ovn_versions:
+    # https://git.centos.org/rpms/rdo-openvswitch/blob/c9s-sig-cloud-openstack-epoxy/f/SPECS/rdo-openvswitch.spec#L10),
+    # which would replace our NFV OVS and OVN 24.03 LTS with 24.09. Hence exclude RDO OVN/OVS.
+    && \
+    if [ -f /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo ]; then \
+      sed -i '/^\[centos-openstack-epoxy\]/a excludepkgs=*rdo-ovn*,*rdo-openvswitch*' /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo; \
+    fi \
     {% endif %}
   # With the UCA keyring installed we can now add all repos.
   base_ubuntu_package_sources_list: |
@@ -470,7 +470,9 @@ 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:
+#TODO(owenjones): these are specific to RL9? Maybe we need to derive a second set
+#of customisations and switch between them
+kolla_build_customizations_rocky_9:
   base_centos_yum_repo_packages_append:
     - centos-release-ceph-squid
   base_centos_yum_repo_packages_remove:
@@ -523,6 +525,10 @@ kolla_build_customizations_rocky:
   ovn_sb_db_server_packages_override:
     - ovn24.03-central
 
+kolla_build_customizations_rocky_10: {}
+
+kolla_build_customizations_rocky: 
+
 kolla_build_customizations_ubuntu: {}
 
 # Dict mapping image customization variable names to their values.
@@ -531,7 +537,7 @@ kolla_build_customizations_ubuntu: {}
 # Hyphens in the image name must be replaced with underscores. The
 # customization is most commonly packages. The operation should be one of
 # override, append or remove. The value should be a list.
-kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_rocky if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
+kolla_build_customizations: "{{ kolla_build_customizations_common | combine((kolla_build_customizations_rocky | to_yaml) if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
 
 # Dict mapping Kolla Dockerfile ARG names to their values.
 kolla_build_args: {}

etc/kayobe/pulp.yml

@@ -682,12 +682,17 @@ stackhpc_pulp_images_kolla:
   - rabbitmq-4-1
   - redis
   - redis-sentinel
+  # - valkey-server
+  # - valkey-sentinel
 
 # List of images for each base distribution which should not/cannot be built.
 stackhpc_kolla_unbuildable_images:
-  ubuntu-noble: []
-  rocky-9: []
-  rocky-10: []
+  ubuntu-noble: {}
+  rocky-9: {}
+  rocky-10:
+    - redis
+    - redis-sentinel
+    # While we wait for valkey backport to 2025.1
 
 # Whitespace-separated list of regular expressions matching Kolla image names.
 # Usage is similar to kolla-build CLI arguments.