Skip to content

Commit 92234d4

Browse files
committed
Merge branch 'master' into alexy_ck_job_5
2 parents f4a0e0f + 039583b commit 92234d4

15 files changed

Lines changed: 411 additions & 233 deletions

File tree

.zuul.yaml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
11
---
2+
- nodeset:
3+
name: telemetry-operator-all-the-features
4+
# Use a larger crc with the nodeset for the parent job to account
5+
# for openshift monitoring and autoscaling features being deployed.
6+
# Original nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-20-1-3xl
7+
# Defined in: openstack-k8s-operators/ci-framework
8+
# Job: cifmw-podified-multinode-edpm-base-crc
9+
nodes:
10+
- name: controller
11+
label: cloud-centos-9-stream-tripleo-medium
12+
- name: compute-0
13+
label: cloud-centos-9-stream-tripleo
14+
- name: crc
15+
label: crc-cloud-ocp-4-20-1-4xl
16+
groups:
17+
- name: computes
18+
nodes:
19+
- compute-0
20+
- name: ocps
21+
nodes:
22+
- crc
23+
224
- job:
325
name: functional-tests-osp18
426
dependencies: ["telemetry-openstack-meta-content-provider-master"]
527
parent: telemetry-operator-multinode-autoscaling
28+
nodeset: telemetry-operator-all-the-features
629
description: |
730
Run autoscaling functional tests, tempest tests, metrics
831
functional tests, graphing functional tests and logging functional tests on
@@ -115,7 +138,6 @@
115138
116139
- job:
117140
name: feature-verification-tests-noop
118-
parent: noop
119141
description: |
120142
A job that always passes. Runs when there's a change to jobs that don't
121143
need full zuul to run but still need to report a pass.
@@ -126,6 +148,7 @@
126148
name: functional-periodic-telemetry-with-ceph
127149
parent: podified-multinode-hci-deployment-crc-1comp-backends
128150
dependencies: ["telemetry-openstack-meta-content-provider-master"]
151+
nodeset: telemetry-operator-all-the-features
129152
description: |
130153
Deploy OpenStack with Telemetry and Ceph. Run metric-verification with volume pool metric tests
131154
extra-vars: *functional_autoscaling_extra_vars
@@ -218,4 +241,3 @@
218241
# case the job definition changes.
219242
- ^roles/telemetry_verify_metrics/tasks/verify_ceilometer_volume_pool_metrics.yml$
220243
- ^.zuul.yaml$
221-

0 commit comments

Comments
 (0)