Skip to content

Commit da5b3e3

Browse files
cescginaopenshift-merge-bot[bot]
authored andcommitted
Simplify adoption jobs layout in ci-framework
This commit contains two changes: - Simplify adoption jobs using content provider There were two adoption jobs using content provider, one for install_yamls and one for ci-framework, this change prepares to remove the install_yamls one and use the ci-framework job everywhere. - Cleanup and rename adoption jobs This change removes duplicated base jobs and renames the adoption jobs to use only lowercase.
1 parent fd9f45a commit da5b3e3

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

zuul.d/adoption.yaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,8 @@
9696
config_nm: false
9797

9898
- job:
99-
name: cifmw-adoption-standalone-base
100-
parent: cifmw-adoption-base
101-
102-
- job:
103-
name: cifmw-data-plane-adoption-OSP-17-to-extracted-crc
104-
parent: content-provider-data-plane-adoption-OSP-17-to-extracted-crc
99+
name: cifmw-data-plane-adoption-osp-17-to-extracted-crc
100+
parent: data-plane-adoption-osp-17-to-extracted-crc
105101
files:
106102
- ^playbooks/01-bootstrap.yml
107103
- ^playbooks/02-infra.yml
@@ -118,3 +114,14 @@
118114
- ^zuul.d/adoption.yaml
119115
- go.mod
120116
- apis/go.mod
117+
required-projects:
118+
- openstack-k8s-operators/openstack-operator
119+
irrelevant-files:
120+
- .ci-operator.yaml
121+
- .ansible-lint
122+
- .gitignore
123+
- .yamllint
124+
- .pre-commit-config.yaml
125+
- LICENSE
126+
- OWNERS
127+
- .*/*.md

zuul.d/project-templates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
github-check:
3333
jobs:
3434
- openstack-k8s-operators-content-provider
35-
- cifmw-data-plane-adoption-OSP-17-to-extracted-crc:
35+
- cifmw-data-plane-adoption-osp-17-to-extracted-crc:
3636
dependencies:
3737
- openstack-k8s-operators-content-provider

0 commit comments

Comments
 (0)