Skip to content

Commit 8656302

Browse files
amoralejopenshift-merge-bot[bot]
authored andcommitted
Replace antelope-controlplane + master-watcher jobs by antelope + epoxy
master branch is not longer supported in centos9 (python3.9) upstream, so we should avoid using it specially in a stable job with antelope based controlplane. This patch is replacing the jobs using watcher from master in antelope controlplane jobs by epoxy based watcher containers. The resulting testing combination is: 1. Antelope controlplane + epoxy watcher (centos 9) - Job on ocp 4.18 - Job on ocp 4.16 2. Master controlplane + master watcher (centos 9) - Job on ocp 4.18 Note we will need to migrate [2] to centos10 which is work in progress right now.
1 parent 538f1bd commit 8656302

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

.zuul.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
jobs:
1111
- noop
1212
- watcher-operator-doc-preview
13-
- watcher-operator-validation
1413
- watcher-operator-kuttl
1514

1615
- job:
@@ -197,6 +196,12 @@
197196
cifmw_test_operator_tempest_namespace: "{{ content_provider_os_registry_url | split('/') | last }}"
198197
cifmw_test_operator_tempest_image_tag: watcher_latest
199198

199+
- job:
200+
name: watcher-operator-validation-epoxy-ocp4-16
201+
parent: watcher-operator-validation-epoxy
202+
description: |
203+
watcher-operator-validation qualification with OCP 4.16
204+
nodeset: centos-9-medium-2x-centos-9-crc-extracted-2-39-0-xxl
200205

201206
##########################################################
202207
# #
@@ -254,14 +259,14 @@
254259
jobs:
255260
- openstack-meta-content-provider-master
256261
- watcher-operator-validation-master
257-
- watcher-operator-validation-ocp4-16
258262

259263
- project-template:
260264
name: opendev-epoxy-watcher-operator-pipeline
261265
github-check:
262266
jobs:
263267
- openstack-meta-content-provider-epoxy
264268
- watcher-operator-validation-epoxy
269+
- watcher-operator-validation-epoxy-ocp4-16
265270

266271
- project-template:
267272
name: opendev-watcher-edpm-pipeline

0 commit comments

Comments
 (0)