Skip to content

Commit f04f572

Browse files
committed
[zuul] Refactor the jobs to use vars files
1 parent c1a18b4 commit f04f572

File tree

3 files changed

+55
-48
lines changed

3 files changed

+55
-48
lines changed

ci/vars-autoscaling-tempest.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
cifmw_run_test_role: test_operator
3+
cifmw_test_operator_tempest_namespace: podified-antelope-centos9
4+
cifmw_test_operator_tempest_container: openstack-tempest-all
5+
cifmw_test_operator_tempest_image_tag: 'current-podified'
6+
# 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
7+
# https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml
8+
cifmw_tempest_tempestconf_config:
9+
overrides: |
10+
validation.run_validation true
11+
identity.v3_endpoint_type public
12+
service_available.ceilometer true
13+
service_available.sg_core true
14+
service_available.aodh true
15+
telemetry.sg_core_service_url "ceilometer.openstack.svc.cluster.local:3000"
16+
cifmw_test_operator_tempest_include_list: |
17+
telemetry_tempest_plugin.scenario
18+
telemetry_tempest_plugin.aodh
19+
cifmw_test_operator_tempest_exclude_list: |
20+
telemetry_tempest_plugin.scenario.test_telemetry_integration_prometheus.PrometheusGabbiTest.test_ceilometer_sg_core_integration

ci/vars-autoscaling.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
cifmw_edpm_prepare_timeout: 60
3+
pre_deploy:
4+
- name: Create COO subscription
5+
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/create-coo-subscription.yaml"
6+
type: playbook
7+
cifmw_edpm_prepare_kustomizations:
8+
- apiVersion: kustomize.config.k8s.io/v1beta1
9+
kind: Kustomization
10+
namespace: openstack
11+
patches:
12+
- patch: |-
13+
apiVersion: core.openstack.org/v1beta1
14+
kind: OpenStackControlPlane
15+
metadata:
16+
name: unused
17+
spec:
18+
heat:
19+
enabled: true
20+
telemetry:
21+
enabled: true
22+
template:
23+
metricStorage:
24+
enabled: true
25+
monitoringStack:
26+
alertingEnabled: false
27+
autoscaling:
28+
enabled: true
29+
target:
30+
kind: OpenStackControlPlane
31+

zuul.d/projects.yaml

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,21 @@
66
description: |
77
Deploy OpenStack with Autoscaling features enabled
88
vars:
9-
cifmw_edpm_prepare_timeout: 60
10-
pre_deploy:
11-
- name: Create COO subscription
12-
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/create-coo-subscription.yaml"
13-
type: playbook
14-
cifmw_edpm_prepare_kustomizations:
15-
- apiVersion: kustomize.config.k8s.io/v1beta1
16-
kind: Kustomization
17-
namespace: openstack
18-
patches:
19-
- patch: |-
20-
apiVersion: core.openstack.org/v1beta1
21-
kind: OpenStackControlPlane
22-
metadata:
23-
name: unused
24-
spec:
25-
heat:
26-
enabled: true
27-
telemetry:
28-
enabled: true
29-
template:
30-
metricStorage:
31-
enabled: true
32-
monitoringStack:
33-
alertingEnabled: false
34-
autoscaling:
35-
enabled: true
36-
target:
37-
kind: OpenStackControlPlane
9+
cifmw_extras:
10+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
3811

3912
- job:
4013
name: telemetry-operator-multinode-autoscaling-tempest
4114
parent: telemetry-operator-multinode-autoscaling
4215
vars:
43-
cifmw_run_test_role: test_operator
44-
cifmw_test_operator_tempest_namespace: podified-antelope-centos9
45-
cifmw_test_operator_tempest_container: openstack-tempest-all
46-
cifmw_test_operator_tempest_image_tag: 'current-podified'
16+
cifmw_extras:
17+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml"
4718
cifmw_test_operator_tempest_external_plugin:
4819
# workaround(telemetry_tempest_plugin_release)
4920
# NOTE: Until the telemetry-tempest-plugin repo is tagged and the new version is used in the tempest image, we need to manually install it as an external plugin to use the autoscaling tests.
5021
- repository: "https://opendev.org/openstack/telemetry-tempest-plugin.git"
5122
changeRepository: "https://review.opendev.org/openstack/telemetry-tempest-plugin"
5223
changeRefspec: "master"
53-
# 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
54-
# https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml
55-
cifmw_tempest_tempestconf_config:
56-
overrides: |
57-
validation.run_validation true
58-
identity.v3_endpoint_type public
59-
service_available.ceilometer true
60-
service_available.sg_core true
61-
service_available.aodh true
62-
telemetry.sg_core_service_url "ceilometer.openstack.svc.cluster.local:3000"
63-
cifmw_test_operator_tempest_include_list: |
64-
telemetry_tempest_plugin.scenario
65-
telemetry_tempest_plugin.aodh
66-
cifmw_test_operator_tempest_exclude_list: |
67-
telemetry_tempest_plugin.scenario.test_telemetry_integration_prometheus.PrometheusGabbiTest.test_ceilometer_sg_core_integration
6824

6925
- project:
7026
name: openstack-k8s-operators/telemetry-operator

0 commit comments

Comments
 (0)