Skip to content

Commit 1fa8d2b

Browse files
morenodopenshift-merge-bot[bot]
morenod
authored and
openshift-merge-bot[bot]
committed
Modify edpm scenarios to install with and without nova-notifications
1 parent fc6011b commit 1fa8d2b

File tree

3 files changed

+195
-62
lines changed

3 files changed

+195
-62
lines changed

‎.zuul.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@
1414

1515
- job:
1616
name: watcher-operator-base
17+
nodeset: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-18-1-3xl
1718
parent: podified-multinode-edpm-deployment-crc-2comp
1819
description: |
1920
A multinode EDPM Zuul job which has one ansible controller, one
2021
extracted crc and two computes. It will be used for testing watcher-operator.
2122
vars:
23+
watcher_scenario: "edpm"
2224
cifmw_extras:
2325
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].
2426
src_dir }}/scenarios/centos-9/multinode-ci.yml"
2527
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].
2628
src_dir }}/scenarios/centos-9/horizon.yml"
2729
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/watcher-operator'].
28-
src_dir }}/ci/scenarios/edpm.yml"
30+
src_dir }}/ci/scenarios/{{ watcher_scenario }}.yml"
2931
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/watcher-operator'].
3032
src_dir }}/ci/tests/watcher-tempest.yml"
3133

@@ -42,6 +44,7 @@
4244
cifmw_dlrn_report_result: true
4345
cifmw_update_containers_openstack: true
4446
cifmw_update_containers_watcher: true
47+
watcher_scenario: "edpm"
4548
cifmw_extras:
4649
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].
4750
src_dir }}/scenarios/centos-9/multinode-ci.yml"
@@ -50,7 +53,7 @@
5053
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].
5154
src_dir }}/scenarios/centos-9/horizon.yml"
5255
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/watcher-operator'].
53-
src_dir }}/ci/scenarios/edpm.yml"
56+
src_dir }}/ci/scenarios/{{ watcher_scenario }}.yml"
5457
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/watcher-operator'].
5558
src_dir }}/ci/tests/watcher-tempest.yml"
5659
fetch_dlrn_hash: false
@@ -142,7 +145,6 @@
142145
cifmw_repo_setup_promotion: podified-ci-testing
143146
cifmw_build_containers_force: true
144147
cifmw_build_containers_image_tag: watcher_latest
145-
146148
- job:
147149
name: watcher-operator-validation-epoxy
148150
parent: watcher-operator-validation-base
@@ -154,6 +156,7 @@
154156
openstack watcher services containers from meta content provider.
155157
It will test current-podified control plane EDPM deployment with openstack watcher
156158
master content. It deploys watcher using TLSe, and creates the certificates to use.
159+
Nova notifications are not enabled on this job.
157160
extra-vars:
158161
# Override zuul meta content provider provided content_provider_dlrn_md5_hash
159162
# var. As returned dlrn md5 hash comes from master release but job is using
@@ -182,6 +185,7 @@
182185
- repository: "https://opendev.org/openstack/watcher-tempest-plugin.git"
183186
changeRepository: "https://review.opendev.org/openstack/watcher-tempest-plugin"
184187
changeRefspec: "380572db57798530b64dcac14c6b01b0382c5d8e"
188+
watcher_scenario: "edpm-no-notifications"
185189

186190
- job:
187191
name: watcher-operator-validation-epoxy-ocp4-16

‎ci/scenarios/edpm-no-notifications.yml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
---
2+
watcher_repo: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/watcher-operator"
3+
watcher_coo_hook: "{{ watcher_repo }}/ci/playbooks/deploy_cluster_observability_operator.yaml"
4+
prometheus_admin_api_hook: "{{ watcher_repo }}/ci/playbooks/prometheus_admin_api.yaml"
5+
6+
# Watcher deploy playbooks
7+
pre_deploy_create_coo_subscription:
8+
- name: Deploy cluster-observability-operator
9+
type: playbook
10+
source: "{{ watcher_coo_hook }}"
11+
post_deploy:
12+
- name: Download needed tools
13+
type: playbook
14+
inventory: "/home/zuul/src/github.com/openstack-k8s-operators/install_yamls/devsetup/hosts"
15+
source: "/home/zuul/src/github.com/openstack-k8s-operators/install_yamls/devsetup/download_tools.yaml"
16+
- name: Patch Openstack Prometheus to enable admin API
17+
type: playbook
18+
source: "{{ prometheus_admin_api_hook }}"
19+
20+
cifmw_edpm_prepare_kustomizations:
21+
- apiVersion: kustomize.config.k8s.io/v1beta1
22+
kind: Kustomization
23+
namespace: openstack
24+
patches:
25+
- patch: |-
26+
apiVersion: core.openstack.org/v1beta1
27+
kind: OpenStackControlPlane
28+
metadata:
29+
name: controlplane
30+
spec:
31+
telemetry:
32+
enabled: true
33+
template:
34+
ceilometer:
35+
enabled: true
36+
metricStorage:
37+
enabled: true
38+
customMonitoringStack:
39+
alertmanagerConfig:
40+
disabled: true
41+
prometheusConfig:
42+
enableRemoteWriteReceiver: true
43+
persistentVolumeClaim:
44+
resources:
45+
requests:
46+
storage: 20G
47+
replicas: 1
48+
scrapeInterval: 30s
49+
resourceSelector:
50+
matchLabels:
51+
service: metricStorage
52+
retention: 24h
53+
target:
54+
kind: OpenStackControlPlane
55+
- patch: |-
56+
apiVersion: core.openstack.org/v1beta1
57+
kind: OpenStackControlPlane
58+
metadata:
59+
name: controlplane
60+
spec:
61+
telemetry:
62+
template:
63+
metricStorage:
64+
monitoringStack: null
65+
target:
66+
kind: OpenStackControlPlane
67+
- patch : |-
68+
apiVersion: core.openstack.org/v1beta1
69+
kind: OpenStackControlPlane
70+
metadata:
71+
name: controlplane
72+
spec:
73+
watcher:
74+
enabled: true
75+
template:
76+
decisionengineServiceTemplate:
77+
customServiceConfig: |
78+
[watcher_cluster_data_model_collectors.compute]
79+
period = 60
80+
[watcher_cluster_data_model_collectors.storage]
81+
period = 60
82+
target:
83+
kind: OpenStackControlPlane
84+
85+
cifmw_edpm_prepare_timeout: 60
86+
87+
cifmw_install_yamls_whitelisted_vars:
88+
- 'WATCHER_REPO'
89+
- 'WATCHER_BRANCH'
90+
- 'OUTPUT_DIR'
91+
92+
cifmw_update_containers_registry: >-
93+
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' and cifmw_repo_setup_release == 'master' -%}
94+
{{ content_provider_os_registry_url | split('/') | first }}
95+
{%- elif content_provider_os_registry_url is defined and content_provider_os_registry_url == 'null' and cifmw_repo_setup_release == 'master' -%}
96+
quay.rdoproject.org
97+
{%- elif watcher_registry_url is defined -%}
98+
{{ watcher_registry_url | split('/') | first }}
99+
{%- else -%}
100+
quay.io
101+
{%- endif -%}
102+
103+
cifmw_update_containers_tag: >-
104+
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
105+
watcher_latest
106+
{%- elif content_provider_os_registry_url is defined and content_provider_os_registry_url == 'null' and cifmw_repo_setup_release == 'master' -%}
107+
current-tested
108+
{%- else -%}
109+
current-podified
110+
{%- endif -%}

‎ci/scenarios/edpm.yml‎

Lines changed: 78 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -22,65 +22,84 @@ cifmw_edpm_prepare_kustomizations:
2222
kind: Kustomization
2323
namespace: openstack
2424
patches:
25-
- patch: |-
26-
apiVersion: core.openstack.org/v1beta1
27-
kind: OpenStackControlPlane
28-
metadata:
29-
name: controlplane
30-
spec:
31-
telemetry:
32-
enabled: true
33-
template:
34-
ceilometer:
35-
enabled: true
36-
metricStorage:
37-
enabled: true
38-
customMonitoringStack:
39-
alertmanagerConfig:
40-
disabled: true
41-
prometheusConfig:
42-
enableRemoteWriteReceiver: true
43-
persistentVolumeClaim:
44-
resources:
45-
requests:
46-
storage: 20G
47-
replicas: 1
48-
scrapeInterval: 30s
49-
resourceSelector:
50-
matchLabels:
51-
service: metricStorage
52-
retention: 24h
53-
target:
54-
kind: OpenStackControlPlane
55-
- patch: |-
56-
apiVersion: core.openstack.org/v1beta1
57-
kind: OpenStackControlPlane
58-
metadata:
59-
name: controlplane
60-
spec:
61-
telemetry:
62-
template:
63-
metricStorage:
64-
monitoringStack: null
65-
target:
66-
kind: OpenStackControlPlane
67-
- patch : |-
68-
apiVersion: core.openstack.org/v1beta1
69-
kind: OpenStackControlPlane
70-
metadata:
71-
name: controlplane
72-
spec:
73-
watcher:
74-
enabled: true
75-
template:
76-
decisionengineServiceTemplate:
77-
customServiceConfig: |
78-
[watcher_cluster_data_model_collectors.compute]
79-
period = 60
80-
[watcher_cluster_data_model_collectors.storage]
81-
period = 60
82-
target:
83-
kind: OpenStackControlPlane
25+
- patch: |-
26+
apiVersion: core.openstack.org/v1beta1
27+
kind: OpenStackControlPlane
28+
metadata:
29+
name: controlplane
30+
spec:
31+
telemetry:
32+
enabled: true
33+
template:
34+
ceilometer:
35+
enabled: true
36+
metricStorage:
37+
enabled: true
38+
customMonitoringStack:
39+
alertmanagerConfig:
40+
disabled: true
41+
prometheusConfig:
42+
enableRemoteWriteReceiver: true
43+
persistentVolumeClaim:
44+
resources:
45+
requests:
46+
storage: 20G
47+
replicas: 1
48+
scrapeInterval: 30s
49+
resourceSelector:
50+
matchLabels:
51+
service: metricStorage
52+
retention: 24h
53+
target:
54+
kind: OpenStackControlPlane
55+
- patch: |-
56+
- op: remove
57+
path: /spec/telemetry/template/metricStorage/monitoringStack
58+
target:
59+
kind: OpenStackControlPlane
60+
- patch: |-
61+
apiVersion: core.openstack.org/v1beta1
62+
kind: OpenStackControlPlane
63+
metadata:
64+
name: controlplane
65+
spec:
66+
nova:
67+
template:
68+
notificationsBusInstance: rabbitmq-notifications
69+
target:
70+
kind: OpenStackControlPlane
71+
- patch: |-
72+
apiVersion: core.openstack.org/v1beta1
73+
kind: OpenStackControlPlane
74+
metadata:
75+
name: controlplane
76+
spec:
77+
rabbitmq:
78+
templates:
79+
rabbitmq-notifications:
80+
delayStartSeconds: 30
81+
override:
82+
service:
83+
metadata:
84+
annotations:
85+
metallb.universe.tf/address-pool: internalapi
86+
metallb.universe.tf/loadBalancerIPs: 172.17.0.87
87+
spec:
88+
type: LoadBalancer
89+
target:
90+
kind: OpenStackControlPlane
91+
- patch: |-
92+
apiVersion: core.openstack.org/v1beta1
93+
kind: OpenStackControlPlane
94+
metadata:
95+
name: controlplane
96+
spec:
97+
watcher:
98+
enabled: true
99+
template:
100+
notificationsBusInstance: rabbitmq-notifications
101+
target:
102+
kind: OpenStackControlPlane
84103
85104
cifmw_edpm_prepare_timeout: 60
86105

0 commit comments

Comments
 (0)