From f487fc5e5cab3446da27ab33b5b5399f83e0ef5a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 5 Mar 2020 10:48:17 +0100
Subject: [PATCH] zuul: drop all CentOS 7 jobs
Change-Id: If63e1d00f0e56b65b636d38a6533c63d2ee1e0e2
---
zuul.d/jobs.yaml | 125 -------------------------------------------
zuul.d/nodesets.yaml | 24 ---------
zuul.d/project.yaml | 25 ---------
3 files changed, 174 deletions(-)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 57092c689..2f2b66dfa 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,12 +1,4 @@
---
-- job:
- name: kolla-ansible-centos-source
- parent: kolla-ansible-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source
parent: kolla-ansible-base
@@ -52,15 +44,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-binary
- parent: kolla-ansible-base
- nodeset: kolla-ansible-centos
- voting: false
- vars:
- base_distro: centos
- install_type: binary
-
- job:
name: kolla-ansible-centos8-binary
parent: kolla-ansible-base
@@ -79,15 +62,6 @@
base_distro: ubuntu
install_type: binary
-- job:
- name: kolla-ansible-centos-source-ceph-ansible
- parent: kolla-ansible-ceph-ansible-base
- nodeset: kolla-ansible-centos-multi
- timeout: 9000
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-ceph-ansible
parent: kolla-ansible-ceph-ansible-base
@@ -106,14 +80,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-source-mariadb
- parent: kolla-ansible-mariadb-base
- nodeset: kolla-ansible-centos-multi
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-mariadb
parent: kolla-ansible-mariadb-base
@@ -130,16 +96,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-source-upgrade
- parent: kolla-ansible-base
- nodeset: kolla-ansible-centos
- timeout: 9000
- vars:
- base_distro: centos
- install_type: source
- is_upgrade: yes
-
- job:
name: kolla-ansible-centos8-source-upgrade
parent: kolla-ansible-base
@@ -170,23 +126,6 @@
install_type: source
is_upgrade: yes
-- job:
- name: kolla-ansible-centos-source-upgrade-ceph-ansible
- parent: kolla-ansible-ceph-ansible-base
- nodeset: kolla-ansible-centos-multi
- timeout: 9000
- vars:
- base_distro: centos
- install_type: source
- is_upgrade: yes
-
-- job:
- name: kolla-ansible-bifrost-centos-source
- parent: kolla-ansible-bifrost-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
-
- job:
name: kolla-ansible-centos8-source-bifrost
parent: kolla-ansible-bifrost-base
@@ -194,14 +133,6 @@
vars:
base_distro: centos
-- job:
- name: kolla-ansible-centos-source-zun
- parent: kolla-ansible-zun-base
- nodeset: kolla-ansible-centos-multi
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-zun
parent: kolla-ansible-zun-base
@@ -218,14 +149,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-source-swift
- parent: kolla-ansible-swift-base
- nodeset: kolla-ansible-centos-multi
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-swift
parent: kolla-ansible-swift-base
@@ -242,14 +165,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-source-scenario-nfv
- parent: kolla-ansible-scenario-nfv-base
- nodeset: kolla-ansible-centos-multi
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-scenario-nfv
parent: kolla-ansible-scenario-nfv-base
@@ -258,14 +173,6 @@
base_distro: centos
install_type: source
-- job:
- name: kolla-ansible-centos-source-ironic
- parent: kolla-ansible-ironic-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-ironic
parent: kolla-ansible-ironic-base
@@ -274,14 +181,6 @@
base_distro: centos
install_type: source
-- job:
- name: kolla-ansible-centos-binary-ironic
- parent: kolla-ansible-ironic-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
- install_type: binary
-
- job:
name: kolla-ansible-centos8-binary-ironic
parent: kolla-ansible-ironic-base
@@ -316,14 +215,6 @@
base_distro: ubuntu
install_type: source
-- job:
- name: kolla-ansible-centos-source-masakari
- parent: kolla-ansible-masakari-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-masakari
parent: kolla-ansible-masakari-base
@@ -332,14 +223,6 @@
base_distro: centos
install_type: source
-- job:
- name: kolla-ansible-centos-source-cells
- parent: kolla-ansible-cells-base
- nodeset: kolla-ansible-centos-multi
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-centos8-source-cells
parent: kolla-ansible-cells-base
@@ -348,14 +231,6 @@
base_distro: centos
install_type: source
-- job:
- name: kolla-ansible-centos-source-linuxbridge
- parent: kolla-ansible-linuxbridge-base
- nodeset: kolla-ansible-centos
- vars:
- base_distro: centos
- install_type: source
-
- job:
name: kolla-ansible-ubuntu-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 588f24fc1..d6f573b02 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,10 +1,4 @@
---
-- nodeset:
- name: kolla-ansible-centos
- nodes:
- - name: primary
- label: centos-7
-
- nodeset:
name: kolla-ansible-centos8
nodes:
@@ -71,24 +65,6 @@
- secondary1
- secondary2
-- nodeset:
- name: kolla-ansible-centos-multi
- nodes:
- - name: primary
- label: centos-7
- - name: secondary1
- label: centos-7
- - name: secondary2
- label: centos-7
- groups:
- - name: switch
- nodes:
- - primary
- - name: peers
- nodes:
- - secondary1
- - secondary2
-
- nodeset:
name: kolla-ansible-centos8-multi
nodes:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5f714f15a..a060e4a05 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -10,48 +10,33 @@
- periodic-stable-jobs
check:
jobs:
- - kolla-ansible-centos-source
- kolla-ansible-centos8-source
- kolla-ansible-debian-source
- kolla-ansible-ubuntu-source
- kolla-ansible-ubuntu-source-multinode-ipv6
- - kolla-ansible-bifrost-centos-source
# FIXME(mgoddard): Bifrost CentOS 8 support in progress.
# - kolla-ansible-centos8-source-bifrost
- - kolla-ansible-centos-source-zun
- kolla-ansible-centos8-source-zun
- kolla-ansible-ubuntu-source-zun
- - kolla-ansible-centos-source-swift
- kolla-ansible-centos8-source-swift
- kolla-ansible-ubuntu-source-swift
- - kolla-ansible-centos-source-scenario-nfv
- kolla-ansible-centos8-source-scenario-nfv
- kolla-ansible-ubuntu-source-masakari
- - kolla-ansible-centos-source-masakari
# FIXME(mgoddard): Masakari CentOS 8 job.
# - kolla-ansible-centos8-source-masakari
- - kolla-ansible-centos-source-ironic
- kolla-ansible-centos8-source-ironic
- - kolla-ansible-centos-binary-ironic
- kolla-ansible-centos8-binary-ironic
- kolla-ansible-ubuntu-source-ironic
- - kolla-ansible-centos-source-upgrade
- kolla-ansible-centos8-source-upgrade
- kolla-ansible-ubuntu-source-upgrade
- - kolla-ansible-centos-binary
- kolla-ansible-centos8-binary
- kolla-ansible-ubuntu-binary
- - kolla-ansible-centos-source-cells
- kolla-ansible-centos8-source-cells
- - kolla-ansible-centos-source-mariadb
- kolla-ansible-centos8-source-mariadb
- kolla-ansible-ubuntu-source-mariadb
- - kolla-ansible-centos-source-ceph-ansible
- kolla-ansible-centos8-source-ceph-ansible
- kolla-ansible-ubuntu-source-ceph-ansible
- - kolla-ansible-centos-source-upgrade-ceph-ansible
- kolla-ansible-ubuntu-source-upgrade-ceph-ansible
- - kolla-ansible-centos-source-linuxbridge
- kolla-ansible-ubuntu-source-linuxbridge
check-arm64:
jobs:
@@ -59,23 +44,13 @@
gate:
queue: kolla
jobs:
- - kolla-ansible-centos-source
- kolla-ansible-centos8-source
- kolla-ansible-ubuntu-source
- - kolla-ansible-centos-source-upgrade
- kolla-ansible-ubuntu-source-upgrade
periodic:
jobs:
- - kolla-ansible-bifrost-centos-source
- - kolla-ansible-centos-source-zun
- kolla-ansible-ubuntu-source-zun
- kolla-ansible-ubuntu-source-masakari
- - kolla-ansible-centos-source-masakari
- - kolla-ansible-centos-source-scenario-nfv
- - kolla-ansible-centos-source-ironic
- - kolla-ansible-centos-binary-ironic
- kolla-ansible-ubuntu-source-ironic
- - kolla-ansible-centos-source-upgrade
- kolla-ansible-ubuntu-source-upgrade
- - kolla-ansible-centos-source-mariadb
- kolla-ansible-ubuntu-source-mariadb
--
GitLab