Skip to content

Commit 7ade7ce

Browse files
kiwikZhuli
authored andcommitted
Clean up deprecated job and nodeset define (apache#107)
Some deprecated job and nodeset define should be marked and clean up, like: 1. openstack-cloud-controller-manager-unittest 2. ubuntu-xenial-large Closes apache#106
1 parent f2f5a42 commit 7ade7ce

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

zuul.d/jobs.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,7 @@
201201
secrets:
202202
- opentelekomcloud_credentials
203203

204-
# Kubernetes jobs
205-
- job:
206-
name: openstack-cloud-controller-manager-unittest
207-
parent: golang-test
208-
description: |
209-
Run Kubernetes openstack-cloud-controller-manager unit test in devstack instance
210-
run: playbooks/openstack-cloud-controller-manager-unittest/run.yaml
211-
nodeset: ubuntu-xenial-large
212-
204+
# OpenLab job self-check jobs
213205
- job:
214206
name: openlab-zuul-jobs-check
215207
parent: init-test
@@ -224,6 +216,16 @@
224216
vars:
225217
excluded_path: ""
226218

219+
# Deprecated (Kubernetes nested scenario)
220+
- job:
221+
name: openstack-cloud-controller-manager-unittest
222+
parent: golang-test
223+
description: |
224+
Run Kubernetes openstack-cloud-controller-manager unit test in devstack instance
225+
run: playbooks/openstack-cloud-controller-manager-unittest/run.yaml
226+
nodeset: ubuntu-xenial-otc
227+
228+
# Kubernetes cloud-provider-openstack jobs
227229
- job:
228230
name: cloud-provider-openstack-unittest
229231
parent: golang-test

zuul.d/nodesets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
label: ubuntu-xenial-ut
2020

2121
- nodeset:
22-
name: ubuntu-xenial-large
22+
name: ubuntu-xenial-otc
2323
nodes:
24-
- name: ubuntu-xenial-large
25-
label: ubuntu-xenial-large
24+
- name: ubuntu-xenial-otc
25+
label: ubuntu-xenial-otc
2626

2727
- nodeset:
2828
name: ubuntu-xenial-vexxhost

0 commit comments

Comments
 (0)