Skip to content

Commit 588bdda

Browse files
committed
[zuul] Add a CloudKitty CI job
1 parent 4dd28e2 commit 588bdda

File tree

2 files changed

+84
-19
lines changed

2 files changed

+84
-19
lines changed

ci/vars-cloudkitty-tempest.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
cifmw_run_tests: true
3+
cifmw_run_test_role: test_operator
4+
cifmw_test_operator_tempest_namespace: podified-antelope-centos9
5+
# cloudkitty tempest plugin is not part of the tempest rpm.
6+
# https://review.rdoproject.org/cgit/openstack/tempest-distgit/tree/openstack-tempest.spec
7+
# We need to add the cloudkitty-tempest-plugin package to RDO, same as TTTP
8+
# https://review.rdoproject.org/cgit/openstack/telemetry-tempest-plugin-distgit/#
9+
# For now, we can force install using the cifmw_test_operator_tempest_external_plugin below.
10+
cifmw_test_operator_tempest_container: openstack-tempest-all
11+
cifmw_test_operator_tempest_image_tag: 'current-podified'
12+
# This value is used to populate the `tempestconfRun` parameter of the Tempest CR: https://openstack-k8s-operators.github.io/test-operator/crds.html#tempest-custom-resource
13+
# https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml
14+
tempest_conf:
15+
overrides: |
16+
validation.run_validation true
17+
identity.v3_endpoint_type public
18+
service_available.ceilometer true
19+
service_available.sg_core true
20+
service_available.aodh true
21+
service_available.cinder false
22+
telemetry.sg_core_service_url "https://ceilometer-internal.openstack.svc.cluster.local:3000"
23+
telemetry.prometheus_service_url "https://metric-storage-prometheus.openstack.svc.cluster.local:9090"
24+
telemetry.ceilometer_polling_interval 120
25+
telemetry.prometheus_scrape_interval 30
26+
telemetry.alarm_threshold 50000000000
27+
cifmw_test_operator_tempest_tempestconf_config: "{{ tempest_conf }}"
28+
cifmw_test_operator_tempest_include_list: |
29+
^tempest.*\[.*\bsmoke\b.*\]
30+
cloudkitty_tempest_plugin.*
31+
telemetry_tempest_plugin.*
32+
cifmw_test_operator_tempest_exclude_list: |
33+
telemetry_tempest_plugin.scenario.test_telemetry_integration_prometheus.PrometheusGabbiTest.test_autoscaling
34+
35+
external_plugin: "opendev.org/openstack/cloudkitty-tempest-plugin"
36+
change_item: "{{ zuul['items'] | selectattr('project.canonical_name', 'equalto', external_plugin) }}"
37+
# This is a workaround because CK tempest is not packages in RDO. Typically, the default would be [], since we would not require an external installation.
38+
cifmw_test_operator_tempest_external_plugin: "{{ [ {'repository': 'https://' + external_plugin + '.git'} ] if change_item | length < 1 else [ { 'repository': 'https://' + external_plugin + '.git', 'changeRepository': 'https://review' + external_plugin, 'changeRefspec': [ 'refs/changes', change_item[0].change[-2:], change_item[0].change, change_item[0].patchset ] | join('/') } ] }}"

zuul.d/projects.yaml

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,28 @@
104104
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml"
105105
irrelevant-files: *irrelevant_files
106106

107+
- job:
108+
name: telemetry-operator-multinode-cloudkitty
109+
dependencies: ["telemetry-openstack-meta-content-provider-master"]
110+
parent: telemetry-operator-multinode-autoscaling
111+
description: |
112+
Deploy CloudKitty and run tempest tests
113+
required-projects:
114+
- name: infrawatch/feature-verification-tests
115+
override-checkout: master
116+
extra-vars: *mcp_extra_vars
117+
vars:
118+
#patch_observabilityclient: true
119+
cifmw_update_containers: false
120+
cifmw_extras:
121+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
122+
# Need a config for CK
123+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-cloudkitty-tempest.yml"
124+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml"
125+
roles:
126+
- zuul: github.com/openstack-k8s-operators/ci-framework
127+
irrelevant-files: *irrelevant_files
128+
107129
- project-template:
108130
name: rdo-telemetry-tempest-plugin-jobs
109131
openstack-experimental:
@@ -133,25 +155,30 @@
133155

134156
- project:
135157
name: openstack-k8s-operators/telemetry-operator
136-
templates:
137-
- podified-multinode-edpm-pipeline
158+
#templates:
159+
# - podified-multinode-edpm-pipeline
138160
github-check:
161+
#debug: true
139162
jobs:
163+
- telemetry-operator-multinode-cloudkitty:
164+
dependencies:
165+
- telemetry-openstack-meta-content-provider-master
140166
- telemetry-openstack-meta-content-provider-master
141-
- telemetry-operator-multinode-default-telemetry
142-
- functional-tests-osp18: &fvt_jobs_config
143-
voting: true
144-
required-projects:
145-
- name: infrawatch/feature-verification-tests
146-
override-checkout: master
147-
irrelevant-files: *irrelevant_files
148-
- feature-verification-tests-noop:
149-
files: *irrelevant_files
150-
- functional-periodic-telemetry-with-ceph:
151-
required-projects:
152-
- name: infrawatch/feature-verification-tests
153-
override-checkout: master
154-
files:
155-
- ci/deploy-telemetry-with-ceph.yml
156-
- ci/vars-telemetry-with-ceph.yml
157-
- zuul.d/projects.yaml
167+
#- telemetry-operator-multinode-default-telemetry
168+
#- functional-tests-osp18: &fvt_jobs_config
169+
# voting: true
170+
# required-projects:
171+
# - name: infrawatch/feature-verification-tests
172+
# override-checkout: master
173+
# irrelevant-files: *irrelevant_files
174+
#- feature-verification-tests-noop:
175+
# files: *irrelevant_files
176+
#- functional-periodic-telemetry-with-ceph:
177+
# required-projects:
178+
# - name: infrawatch/feature-verification-tests
179+
# override-checkout: master
180+
# files:
181+
# - ci/deploy-telemetry-with-ceph.yml
182+
# - ci/vars-telemetry-with-ceph.yml
183+
# - zuul.d/projects.yaml
184+

0 commit comments

Comments
 (0)