Merge pull request #229 from stackhpc/upstream/yoga-2023-06-05

Synchronise yoga with upstream

Author: markgoddard

.zuul.d/centos.yaml

@@ -7,9 +7,7 @@
         - kolla-build-centos9s-source
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-binary
-        - kolla-ansible-centos9s-source:
-            vars:
-              kolla_python_version: "3.9"
+        - kolla-ansible-centos9s-source
         - kolla-ansible-centos8s-source-upgrade
     check-arm64:
       jobs:
@@ -108,6 +106,7 @@
     voting: false
     vars:
       base_distro: centos
+      base_distro_version: stream9
       install_type: source
 
 - job:
@@ -157,4 +156,5 @@
     nodeset: kolla-centos-9-stream
     vars:
       base_distro: centos
+      base_distro_version: stream9
       install_type: source

.zuul.d/rocky.yaml

@@ -3,20 +3,14 @@
     check:
       jobs:
         - kolla-build-rocky9-source
-        - kolla-ansible-rocky9-source:
-            vars:
-              base_distro: "rocky"
-              kolla_python_version: "3.9"
+        - kolla-ansible-rocky9-source
     check-arm64:
       jobs:
         - kolla-build-rocky9-aarch64
     gate:
       jobs:
         - kolla-build-rocky9
-        - kolla-ansible-rocky9-source:
-            vars:
-              base_distro: "rocky"
-              kolla_python_version: "3.9"
+        - kolla-ansible-rocky9-source
     periodic:
       jobs:
         - kolla-publish-rocky9-source-quay

docker/base/Dockerfile.j2

@@ -62,6 +62,7 @@ Repo files not available for CentOS Stream 9:
  #}
 {% set base_yum_repo_files = [
     'grafana.repo',
+    'influxdb.repo',
     'mariadb.repo',
     'proxysql.repo',
     'rabbitmq_rabbitmq-server.repo',
@@ -90,19 +91,15 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management
 
 {% if base_arch == 'x86_64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
-        'influxdb.repo',
         'rabbitmq_rabbitmq-erlang.repo',
     ] %}
-    # FIXME(mgoddard): Not available for CentOS 8 yet.
-    #   'crmsh.repo',
 
     {% set base_yum_repo_keys = base_yum_repo_keys + [
         'https://repos.influxdata.com/influxdb.key',
     ] %}
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
         'hrw-copr-erlang-for-rabbitmq.repo',
-        'mariadb.repo',
     ] %}
 
     {% set base_yum_repo_keys = base_yum_repo_keys + [

kolla/image/build.py

@@ -121,6 +121,7 @@ class Status(Enum):
         "monasca-base",          # No support for OpenSearch
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
+        "proxysql",              # 2.3 not supported on EL9
         "storm-base",            # Monasca dependency
         "tgtd",                  # Not supported on CentOS
     },

tests/playbooks/run.yml

@@ -23,6 +23,16 @@
         mode: 0777
       become: true
 
+    - name: Add base_tag config
+      vars:
+        kolla_base_tag_config:
+          DEFAULT:
+            base_tag: "{{ base_distro_version }}"
+      set_fact:
+        kolla_build_config: "{{ kolla_build_config | combine(kolla_base_tag_config, recursive=True) }}"
+      when:
+        - base_distro_version is defined
+
     - name: Add publisher config
       vars:
         kolla_publisher_config: