From 43f68d948ef98917972419b7ed00b811214dbc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 21 Oct 2020 20:25:11 +0200 Subject: [PATCH] CI: Move to centos-8-stream Co-Authored-By: Michal Nasiadka Change-Id: I413f484d60d7cdfa03f3f8d779f07462be15d2dd --- zuul.d/jobs.yaml | 88 ++++++++++++++++++++++---------------------- zuul.d/nodesets.yaml | 57 ++++++++++++++++++++++++++++ zuul.d/project.yaml | 48 ++++++++++++------------ 3 files changed, 125 insertions(+), 68 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6df04f6c24..4378dc9fe3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,8 +1,8 @@ --- - job: - name: kolla-ansible-centos8-source + name: kolla-ansible-centos8s-source parent: kolla-ansible-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source @@ -37,9 +37,9 @@ tls_enabled: true - job: - name: kolla-ansible-centos8-source-kvm + name: kolla-ansible-centos8s-source-kvm parent: kolla-ansible-kvm-base - nodeset: kolla-ansible-centos8-nested-virt + nodeset: kolla-ansible-centos8s-nested-virt vars: base_distro: centos install_type: source @@ -53,9 +53,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-multinode-ipv6 + name: kolla-ansible-centos8s-source-multinode-ipv6 parent: kolla-ansible-ipv6-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -69,9 +69,9 @@ install_type: source - job: - name: kolla-ansible-centos8-binary + name: kolla-ansible-centos8s-binary parent: kolla-ansible-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s voting: false vars: base_distro: centos @@ -87,9 +87,9 @@ install_type: binary - job: - name: kolla-ansible-centos8-source-cephadm + name: kolla-ansible-centos8s-source-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi timeout: 9000 vars: base_distro: centos @@ -105,9 +105,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-mariadb + name: kolla-ansible-centos8s-source-mariadb parent: kolla-ansible-mariadb-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -121,9 +121,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-upgrade + name: kolla-ansible-centos8s-source-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s timeout: 9000 vars: base_distro: centos @@ -160,9 +160,9 @@ tls_enabled: true - job: - name: kolla-ansible-centos8-source-upgrade-cephadm + name: kolla-ansible-centos8s-source-upgrade-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi timeout: 9000 vars: base_distro: centos @@ -180,16 +180,16 @@ is_upgrade: yes - job: - name: kolla-ansible-centos8-source-bifrost + name: kolla-ansible-centos8s-source-bifrost parent: kolla-ansible-bifrost-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos - job: - name: kolla-ansible-centos8-source-zun + name: kolla-ansible-centos8s-source-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -203,9 +203,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-swift + name: kolla-ansible-centos8s-source-swift parent: kolla-ansible-swift-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -219,25 +219,25 @@ install_type: source - job: - name: kolla-ansible-centos8-source-scenario-nfv + name: kolla-ansible-centos8s-source-scenario-nfv parent: kolla-ansible-scenario-nfv-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source - job: - name: kolla-ansible-centos8-source-ironic + name: kolla-ansible-centos8s-source-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source - job: - name: kolla-ansible-centos8-binary-ironic + name: kolla-ansible-centos8s-binary-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: binary @@ -261,9 +261,9 @@ install_type: binary - job: - name: kolla-ansible-centos8-source-magnum + name: kolla-ansible-centos8s-source-magnum parent: kolla-ansible-magnum-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source @@ -277,9 +277,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-octavia + name: kolla-ansible-centos8s-source-octavia parent: kolla-ansible-octavia-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source @@ -301,25 +301,25 @@ install_type: source - job: - name: kolla-ansible-centos8-source-masakari + name: kolla-ansible-centos8s-source-masakari parent: kolla-ansible-masakari-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source - job: - name: kolla-ansible-centos8-source-monasca + name: kolla-ansible-centos8s-source-monasca parent: kolla-ansible-monasca-base - nodeset: kolla-ansible-centos8-multi-monasca + nodeset: kolla-ansible-centos8s-multi-monasca vars: base_distro: centos install_type: source - job: - name: kolla-ansible-centos8-source-cells + name: kolla-ansible-centos8s-source-cells parent: kolla-ansible-cells-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -333,17 +333,17 @@ install_type: source - job: - name: kolla-ansible-centos8-source-linuxbridge + name: kolla-ansible-centos8s-source-linuxbridge parent: kolla-ansible-linuxbridge-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source - job: - name: kolla-ansible-centos8-source-ovn + name: kolla-ansible-centos8s-source-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-centos8-multi + nodeset: kolla-ansible-centos8s-multi vars: base_distro: centos install_type: source @@ -357,9 +357,9 @@ install_type: source - job: - name: kolla-ansible-centos8-source-prometheus-efk + name: kolla-ansible-centos8s-source-prometheus-efk parent: kolla-ansible-prometheus-efk-base - nodeset: kolla-ansible-centos8 + nodeset: kolla-ansible-centos8s vars: base_distro: centos install_type: source diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 29434ecfbb..67c60adfc1 100644 --- a/zuul.d/nodesets.yaml +++ b/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: @@ -59,6 +65,24 @@ - secondary1 - secondary2 +- 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 + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary1 + - secondary2 + - nodeset: name: kolla-ansible-focal-nested-virt nodes: @@ -71,6 +95,12 @@ - name: primary label: nested-virt-centos-8 +- nodeset: + name: kolla-ansible-centos8s-nested-virt + nodes: + - name: primary + label: nested-virt-centos-8-stream + - nodeset: name: kolla-ansible-centos8-multi-monasca nodes: @@ -97,3 +127,30 @@ - secondary3 - secondary4 - secondary5 + +- nodeset: + name: kolla-ansible-centos8s-multi-monasca + nodes: + - name: primary + label: centos-8-stream + - name: secondary1 + label: centos-8-stream + - name: secondary2 + label: centos-8-stream + - name: secondary3 + label: centos-8-stream + - name: secondary4 + label: centos-8-stream + - name: secondary5 + label: centos-8-stream + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary1 + - secondary2 + - secondary3 + - secondary4 + - secondary5 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0da451d62f..3bdf9c3cf1 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -10,46 +10,46 @@ - periodic-stable-jobs check: jobs: - - kolla-ansible-centos8-source + - kolla-ansible-centos8s-source - kolla-ansible-debian-source - kolla-ansible-ubuntu-source - - kolla-ansible-centos8-source-kvm + - kolla-ansible-centos8s-source-kvm - kolla-ansible-ubuntu-source-kvm - - kolla-ansible-centos8-source-multinode-ipv6 + - kolla-ansible-centos8s-source-multinode-ipv6 - kolla-ansible-ubuntu-source-multinode-ipv6 - - kolla-ansible-centos8-source-bifrost - - kolla-ansible-centos8-source-zun + - kolla-ansible-centos8s-source-bifrost + - kolla-ansible-centos8s-source-zun - kolla-ansible-ubuntu-source-zun - - kolla-ansible-centos8-source-swift + - kolla-ansible-centos8s-source-swift - kolla-ansible-ubuntu-source-swift - - kolla-ansible-centos8-source-scenario-nfv - - kolla-ansible-centos8-source-magnum + - kolla-ansible-centos8s-source-scenario-nfv + - kolla-ansible-centos8s-source-magnum - kolla-ansible-ubuntu-source-magnum - - kolla-ansible-centos8-source-octavia + - kolla-ansible-centos8s-source-octavia - kolla-ansible-ubuntu-source-octavia - - kolla-ansible-centos8-source-masakari + - kolla-ansible-centos8s-source-masakari - kolla-ansible-ubuntu-source-masakari - - kolla-ansible-centos8-source-ironic - - kolla-ansible-centos8-binary-ironic + - kolla-ansible-centos8s-source-ironic + - kolla-ansible-centos8s-binary-ironic - kolla-ansible-ubuntu-source-ironic - - kolla-ansible-centos8-source-upgrade + - kolla-ansible-centos8s-source-upgrade - kolla-ansible-debian-source-upgrade - kolla-ansible-ubuntu-source-upgrade - - kolla-ansible-centos8-binary + - kolla-ansible-centos8s-binary - kolla-ansible-ubuntu-binary - - kolla-ansible-centos8-source-cells - - kolla-ansible-centos8-source-mariadb + - kolla-ansible-centos8s-source-cells + - kolla-ansible-centos8s-source-mariadb - kolla-ansible-ubuntu-source-mariadb - - kolla-ansible-centos8-source-linuxbridge + - kolla-ansible-centos8s-source-linuxbridge - kolla-ansible-ubuntu-source-linuxbridge - - kolla-ansible-centos8-source-ovn + - kolla-ansible-centos8s-source-ovn - kolla-ansible-ubuntu-source-ovn - - kolla-ansible-centos8-source-prometheus-efk + - kolla-ansible-centos8s-source-prometheus-efk - kolla-ansible-ubuntu-source-prometheus-efk - - kolla-ansible-centos8-source-monasca - - kolla-ansible-centos8-source-cephadm + - kolla-ansible-centos8s-source-monasca + - kolla-ansible-centos8s-source-cephadm - kolla-ansible-ubuntu-source-cephadm - - kolla-ansible-centos8-source-upgrade-cephadm + - kolla-ansible-centos8s-source-upgrade-cephadm - kolla-ansible-ubuntu-source-upgrade-cephadm check-arm64: jobs: @@ -58,7 +58,7 @@ gate: queue: kolla jobs: - - kolla-ansible-centos8-source - - kolla-ansible-centos8-source-upgrade + - kolla-ansible-centos8s-source + - kolla-ansible-centos8s-source-upgrade - kolla-ansible-ubuntu-source - kolla-ansible-ubuntu-source-upgrade