Skip to content

Commit aede059

Browse files
raukadahraukadah
committed
Test opendev watcher master content in CI job
In order to test opendev watcher master content in CI job, this pr adds following thigs: * opendev-master-watcher-operator-pipeline project template which will run meta content provider from master and then Deploy EDPM job watcher-operator-validation-master from mastter content. * It changes the existing job watcher-operator-validation (still deploying the antelope content) with update_containers: false to avoid using meta content provider containers. * It also updates the existing watcher-operator-validation and watcher-operator-kuttl job to use openstack-meta-content-provider-master as a job dependencies. Depends-On: https://review.opendev.org/c/openstack/watcher/+/938893 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
1 parent c983242 commit aede059

File tree

4 files changed

+100
-7
lines changed

4 files changed

+100
-7
lines changed

‎.zuul.yaml‎

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
- project:
33
name: openstack-k8s-operators/watcher-operator
44
default-branch: main
5+
templates:
6+
- opendev-master-watcher-operator-pipeline
57
github-check:
68
jobs:
79
- noop
810
- watcher-operator-doc-preview
9-
- openstack-meta-content-provider:
10-
vars:
11-
cifmw_operator_build_meta_build: false
1211
- watcher-operator-validation
1312
- watcher-operator-kuttl
1413

1514
- job:
1615
name: watcher-operator-base
16+
override-checkout: main
1717
parent: podified-multinode-edpm-deployment-crc-2comp
18-
dependencies: ["openstack-meta-content-provider"]
18+
dependencies: ["openstack-meta-content-provider-master"]
1919
description: |
2020
A multinode EDPM Zuul job which has one ansible controller, one
2121
extracted crc and two computes. It will be used for testing watcher-operator.
@@ -40,9 +40,19 @@
4040
A zuul job to validate the watcher operator and its service deployment.
4141
vars:
4242
run_tempest: false
43+
# Donot use openstack services from meta content provider master
44+
# job.
45+
cifmw_update_containers: false
46+
extra-vars:
47+
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
48+
# var. As returned dlrn md5 hash comes from master release but job is using
49+
# antelope content.
50+
content_provider_dlrn_md5_hash: ''
4351

4452
- job:
4553
name: watcher-operator-kuttl
54+
override-checkout: main
55+
dependencies: ["openstack-meta-content-provider-master"]
4656
parent: cifmw-multinode-kuttl-operator-target
4757
description: |
4858
A zuul job to run watcher operator kuttl tests.
@@ -61,6 +71,11 @@
6171
source: "{{ watcher_hook }}"
6272
extra_vars:
6373
watcher_catalog_image: "{{ content_provider_registry_ip }}:5001/openstack-k8s-operators/watcher-operator-index:{{ zuul.patchset }}"
74+
extra-vars:
75+
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
76+
# var. As returned dlrn md5 hash comes from master release but job is using
77+
# antelope content.
78+
content_provider_dlrn_md5_hash: ''
6479

6580
- job:
6681
name: watcher-operator-doc-preview
@@ -71,3 +86,52 @@
7186
vars:
7287
asciidoc_available: true
7388
doc_available: false
89+
90+
##########################################################
91+
# #
92+
# Master Zuul Jobs #
93+
# #
94+
##########################################################
95+
96+
97+
- job:
98+
name: openstack-meta-content-provider-master
99+
override-checkout: main
100+
description: |
101+
A zuul job building content from OpenDev master release.
102+
parent: openstack-meta-content-provider
103+
vars:
104+
cifmw_operator_build_meta_build: false
105+
cifmw_bop_openstack_release: master
106+
cifmw_bop_dlrn_baseurl: "https://trunk.rdoproject.org/centos9-master"
107+
cifmw_repo_setup_branch: master
108+
109+
- job:
110+
name: watcher-operator-validation-master
111+
parent: watcher-operator-validation
112+
override-checkout: main
113+
description: |
114+
A Zuul job consuming content from openstack-meta-content-provider-master
115+
and deploying EDPM with master content.
116+
dependencies: ["openstack-meta-content-provider-master"]
117+
vars:
118+
cifmw_repo_setup_branch: master
119+
# To consume containers from meta content provider
120+
cifmw_update_containers_openstack: true
121+
122+
##########################################################
123+
# #
124+
# Project Template #
125+
# #
126+
##########################################################
127+
128+
- project-template:
129+
name: opendev-master-watcher-operator-pipeline
130+
description: |
131+
Project template to run meta content provider and
132+
EDPM job with master opendev and github operator
133+
content.
134+
github-check:
135+
jobs:
136+
- openstack-meta-content-provider-master
137+
- watcher-operator-validation-master

‎Makefile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,15 @@ update-watcher-csv:
375375
fi
376376

377377
CATALOG_IMAGE ?= quay.io/openstack-k8s-operators/watcher-operator-index:latest
378+
WATCHER_API_IMAGE_URL_DEFAULT ?= quay.io/podified-master-centos9/openstack-watcher-api:current-podified
379+
WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT ?= quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
380+
WATCHER_APPLIER_IMAGE_URL_DEFAULT ?= quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
381+
378382

379383
.PHONY: watcher
384+
watcher: export WATCHER_API_IMAGE_URL_DEFAULT=${WATCHER_API_IMAGE_URL_DEFAULT}
385+
watcher: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=${WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT}
386+
watcher: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=${WATCHER_APPLIER_IMAGE_URL_DEFAULT}
380387
watcher: export CATALOG_IMG=${CATALOG_IMAGE}
381388
watcher: ## Install watcher operator via olm
382389
bash ci/olm.sh
@@ -449,9 +456,9 @@ SKIP_CERT ?=false
449456
.PHONY: run-with-webhook
450457
run-with-webhook: export METRICS_PORT?=33080
451458
run-with-webhook: export HEALTH_PORT?=33081
452-
run-with-webhook: export WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified
453-
run-with-webhook: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
454-
run-with-webhook: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
459+
run-with-webhook: export WATCHER_API_IMAGE_URL_DEFAULT=${WATCHER_API_IMAGE_URL_DEFAULT}
460+
run-with-webhook: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=${WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT}
461+
run-with-webhook: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=${WATCHER_APPLIER_IMAGE_URL_DEFAULT}
455462
run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
456463
/bin/bash hack/clean_local_webhook.sh
457464
/bin/bash hack/run_with_local_webhook.sh

‎ci/olm.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,12 @@ spec:
3333
channel: alpha
3434
source: watcher-operator-index
3535
sourceNamespace: openstack-operators
36+
config:
37+
env:
38+
- name: WATCHER_API_IMAGE_URL_DEFAULT
39+
value: ${WATCHER_API_IMAGE_URL_DEFAULT}
40+
- name: WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT
41+
value: ${WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT}
42+
- name: WATCHER_APPLIER_IMAGE_URL_DEFAULT
43+
value: ${WATCHER_APPLIER_IMAGE_URL_DEFAULT}
3644
EOF_CAT

‎ci/playbooks/deploy_watcher_service.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,27 @@
88
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
99
PATH: "{{ cifmw_path }}"
1010
tasks:
11+
- name: Fetch dlrn md5_hash from master DLRN repo
12+
ansible.builtin.uri:
13+
url: "https://{{ watcher_dlrn_server | default('trunk.rdoproject.org') }}/{{ watcher_dlrn_namespace | default('centos9-master') }}/{{ watcher_dlrn_tag | default('current-podified') }}/delorean.repo.md5"
14+
return_content: true
15+
register: latest_dlrn_tag
16+
until: latest_dlrn_tag.status == 200
17+
retries: 6
18+
delay: 5
19+
1120
- name: Install Watcher Operator
21+
vars:
22+
_tag: "{{ latest_dlrn_tag.content }}"
1223
cifmw.general.ci_script:
1324
output_dir: "{{ cifmw_basedir }}/artifacts"
1425
chdir: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/watcher-operator"
1526
script: make watcher
1627
extra_args:
1728
CATALOG_IMAGE: "{{ watcher_catalog_image | default('quay.io/openstack-k8s-operators/watcher-operator-index:latest') }}"
29+
WATCHER_API_IMAGE_URL_DEFAULT: "{{ content_provider_os_registry_url }}/openstack-watcher-api:{{ _tag }}"
30+
WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT: "{{ content_provider_os_registry_url }}/openstack-watcher-decision-engine:{{ _tag }}"
31+
WATCHER_APPLIER_IMAGE_URL_DEFAULT: "{{ content_provider_os_registry_url }}/openstack-watcher-applier:{{ _tag }}"
1832

1933
- name: Deploy Watcher service
2034
when: deploy_watcher_service | default('true') | bool

0 commit comments

Comments
 (0)