Skip to content

Commit bfc4c8e

Browse files
committed
[CI] Stop testing non-stream CentOS
Per [1]. It was agreed on during a Kolla IRC meeting. [2] This continues building non-stream images but using stream on the host. [1] http://lists.openstack.org/pipermail/openstack-discuss/2021-December/026408.html [2] https://meetings.opendev.org/meetings/kolla/2021/kolla.2021-12-22-15.01.log.html#l-53 Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/823555 Change-Id: I080ad3bbc0e53cec2ac11bfd485c97d88388ef79
1 parent d034341 commit bfc4c8e

File tree

2 files changed

+4
-46
lines changed

2 files changed

+4
-46
lines changed

.zuul.d/base.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A
5252
0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
5353

54-
- nodeset:
55-
name: kolla-centos8
56-
nodes:
57-
- name: primary
58-
label: centos-8
59-
6054
- nodeset:
6155
name: kolla-centos8-stream
6256
nodes:
@@ -75,12 +69,6 @@
7569
- name: primary
7670
label: debian-buster
7771

78-
- nodeset:
79-
name: kolla-centos8-aarch64
80-
nodes:
81-
- name: primary
82-
label: centos-8-arm64
83-
8472
- nodeset:
8573
name: kolla-centos8-stream-aarch64
8674
nodes:

.zuul.d/centos.yaml

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
- kolla-build-centos8-source
77
- kolla-build-centos8s-binary
88
- kolla-build-centos8s-source
9-
- kolla-ansible-centos8-source
10-
- kolla-ansible-centos8-binary
11-
- kolla-ansible-centos8-source-upgrade
129
- kolla-ansible-centos8s-source
1310
- kolla-ansible-centos8s-binary
1411
- kolla-ansible-centos8s-source-upgrade
@@ -21,8 +18,6 @@
2118
jobs:
2219
- kolla-build-centos8-source
2320
- kolla-build-centos8s-source
24-
- kolla-ansible-centos8-source
25-
- kolla-ansible-centos8-source-upgrade
2621
- kolla-ansible-centos8s-source
2722
- kolla-ansible-centos8s-source-upgrade
2823
periodic:
@@ -46,31 +41,6 @@
4641
experimental:
4742
jobs:
4843
- kolla-build-no-infra-wheels-centos8-source
49-
- kolla-ansible-centos8-source-bifrost:
50-
files: ^docker\/(base|bifrost|openstack-base)\/.*
51-
# Test rabbitmq & mariadb changes in multinode ceph jobs.
52-
- kolla-ansible-centos8-source-ceph-ansible:
53-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
54-
- kolla-ansible-centos8-source-upgrade-ceph-ansible:
55-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
56-
- kolla-ansible-centos8-source-zun:
57-
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
58-
- kolla-ansible-centos8-source-scenario-nfv:
59-
files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
60-
- kolla-ansible-centos8-source-ironic:
61-
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
62-
- kolla-ansible-centos8-source-swift:
63-
files: ^docker/(base|openstack-base|glance|swift)/
64-
- kolla-ansible-centos8-source-mariadb:
65-
files: ^docker/(base|mariadb)/
66-
- kolla-ansible-centos8-source-masakari:
67-
files: ^docker/(base|masakari)/
68-
- kolla-ansible-centos8-source-ovn:
69-
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
70-
- kolla-ansible-centos8-source-prometheus-efk:
71-
files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
72-
- kolla-ansible-centos8-source-kvm:
73-
files: ^docker/nova/
7444
- kolla-ansible-centos8s-source-bifrost:
7545
files: ^docker\/(base|bifrost|openstack-base)\/.*
7646
# Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -100,7 +70,7 @@
10070
- job:
10171
name: kolla-build-centos8-binary
10272
parent: kolla-base
103-
nodeset: kolla-centos8
73+
nodeset: kolla-centos8-stream
10474
voting: false
10575
vars:
10676
base_distro: centos
@@ -164,7 +134,7 @@
164134
- job:
165135
name: kolla-build-centos8-source
166136
parent: kolla-base
167-
nodeset: kolla-centos8
137+
nodeset: kolla-centos8-stream
168138
vars:
169139
base_distro: centos
170140
install_type: source
@@ -182,7 +152,7 @@
182152
- job:
183153
name: kolla-build-centos8-source-aarch64
184154
parent: kolla-build-centos8-source
185-
nodeset: kolla-centos8-aarch64
155+
nodeset: kolla-centos8-stream-aarch64
186156
voting: false
187157

188158
- job:
@@ -238,7 +208,7 @@
238208
- job:
239209
name: kolla-build-no-infra-wheels-centos8-source
240210
parent: kolla-build-no-infra-wheels-base
241-
nodeset: kolla-centos8
211+
nodeset: kolla-centos8-stream
242212
vars:
243213
base_distro: centos
244214
install_type: source

0 commit comments

Comments
 (0)