Merge "CI: Add centos-8-stream jobs" into stable/victoria

Author: Zuul

tests/templates/globals-default.j2

@@ -19,6 +19,10 @@ docker_custom_config:
 distro_python_version: "{{ kolla_python_version }}"
 {% endif %}
 
+{% if base_tag_suffix is defined and not is_upgrade %}
+openstack_tag_suffix: "{{ base_tag_suffix }}"
+{% endif %}
+
 # Use a random router id, otherwise it may result in the same router id
 # in the CI gate.
 keepalived_virtual_router_id: "{{ 250 | random(1) }}"

zuul.d/jobs.yaml

@@ -8,6 +8,16 @@
       install_type: source
       tls_enabled: true
 
+- job:
+    name: kolla-ansible-centos8s-source
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+      tls_enabled: true
+
 - job:
     name: kolla-ansible-debian-source-aarch64
     parent: kolla-ansible-debian-source
@@ -44,6 +54,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-kvm
+    parent: kolla-ansible-kvm-base
+    nodeset: kolla-ansible-centos8s-nested-virt
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-kvm
     parent: kolla-ansible-kvm-base
@@ -60,6 +79,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-multinode-ipv6
+    parent: kolla-ansible-ipv6-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-multinode-ipv6
     parent: kolla-ansible-ipv6-base
@@ -77,6 +105,16 @@
       base_distro: centos
       install_type: binary
 
+- job:
+    name: kolla-ansible-centos8s-binary
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-centos8s
+    voting: false
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: binary
+
 - job:
     name: kolla-ansible-ubuntu-binary
     parent: kolla-ansible-base
@@ -95,6 +133,16 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-ceph-ansible
+    parent: kolla-ansible-ceph-ansible-base
+    nodeset: kolla-ansible-centos8s-multi
+    timeout: 9000
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-ceph-ansible
     parent: kolla-ansible-ceph-ansible-base
@@ -112,6 +160,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-mariadb
+    parent: kolla-ansible-mariadb-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-mariadb
     parent: kolla-ansible-mariadb-base
@@ -130,6 +187,17 @@
       install_type: source
       is_upgrade: yes
 
+- job:
+    name: kolla-ansible-centos8s-source-upgrade
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-centos8s
+    timeout: 9000
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-debian-source-upgrade
     parent: kolla-ansible-base
@@ -166,6 +234,17 @@
       install_type: source
       is_upgrade: yes
 
+- job:
+    name: kolla-ansible-centos8s-source-upgrade-ceph-ansible
+    parent: kolla-ansible-ceph-ansible-base
+    nodeset: kolla-ansible-centos8s-multi
+    timeout: 9000
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+      is_upgrade: yes
+
 - job:
     name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible
     parent: kolla-ansible-ceph-ansible-base
@@ -183,6 +262,14 @@
     vars:
       base_distro: centos
 
+- job:
+    name: kolla-ansible-centos8s-source-bifrost
+    parent: kolla-ansible-bifrost-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+
 - job:
     name: kolla-ansible-centos8-source-zun
     parent: kolla-ansible-zun-base
@@ -191,6 +278,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-zun
+    parent: kolla-ansible-zun-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-zun
     parent: kolla-ansible-zun-base
@@ -207,6 +303,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-swift
+    parent: kolla-ansible-swift-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-swift
     parent: kolla-ansible-swift-base
@@ -223,6 +328,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-scenario-nfv
+    parent: kolla-ansible-scenario-nfv-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-centos8-source-ironic
     parent: kolla-ansible-ironic-base
@@ -231,6 +345,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-ironic
+    parent: kolla-ansible-ironic-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-centos8-binary-ironic
     parent: kolla-ansible-ironic-base
@@ -239,6 +362,15 @@
       base_distro: centos
       install_type: binary
 
+- job:
+    name: kolla-ansible-centos8s-binary-ironic
+    parent: kolla-ansible-ironic-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: binary
+
 - job:
     name: kolla-ansible-ubuntu-source-ironic
     parent: kolla-ansible-ironic-base
@@ -265,6 +397,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-magnum
+    parent: kolla-ansible-magnum-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-magnum
     parent: kolla-ansible-magnum-base
@@ -289,6 +430,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-masakari
+    parent: kolla-ansible-masakari-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-centos8-source-cells
     parent: kolla-ansible-cells-base
@@ -297,6 +447,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-cells
+    parent: kolla-ansible-cells-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-linuxbridge
     parent: kolla-ansible-linuxbridge-base
@@ -313,6 +472,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-linuxbridge
+    parent: kolla-ansible-linuxbridge-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-centos8-source-ovn
     parent: kolla-ansible-ovn-base
@@ -321,6 +489,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-ovn
+    parent: kolla-ansible-ovn-base
+    nodeset: kolla-ansible-centos8s-multi
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-ovn
     parent: kolla-ansible-ovn-base
@@ -337,6 +514,15 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-ansible-centos8s-source-prometheus-efk
+    parent: kolla-ansible-prometheus-efk-base
+    nodeset: kolla-ansible-centos8s
+    vars:
+      base_distro: centos
+      base_tag_suffix: "-centos8s"
+      install_type: source
+
 - job:
     name: kolla-ansible-ubuntu-source-prometheus-efk
     parent: kolla-ansible-prometheus-efk-base

zuul.d/nodesets.yaml

@@ -5,6 +5,12 @@
       - name: primary
         label: centos-8
 
+- nodeset:
+    name: kolla-ansible-centos8s
+    nodes:
+      - name: primary
+        label: centos-8-stream
+
 - nodeset:
     name: kolla-ansible-debian
     nodes:
@@ -49,6 +55,16 @@
       - name: secondary2
         label: centos-8
 
+- nodeset:
+    name: kolla-ansible-centos8s-multi
+    nodes:
+      - name: primary
+        label: centos-8-stream
+      - name: secondary1
+        label: centos-8-stream
+      - name: secondary2
+        label: centos-8-stream
+
 - nodeset:
     name: kolla-ansible-focal-nested-virt
     nodes:
@@ -60,3 +76,9 @@
     nodes:
       - name: primary
         label: nested-virt-centos-8
+
+- nodeset:
+    name: kolla-ansible-centos8s-nested-virt
+    nodes:
+      - name: primary
+        label: nested-virt-centos-8-stream