Skip to content

Commit 640970d

Browse files
committed
Add to irrelevant_files list for graphing, logging
and autoscaling jobs Add to irrelevant_files list for graphing, logging and autoscaling jobs Add metrics verification tasks for power monitoring components (#193) Move container image patch to post_ctlplane hook Make autoscaling job voting Add tasks to show queried metrics [ci][logging] Move file tests to the compute nodes (#206) [ci] logging test: fix typo 0->O (#205) [ci][autoscaling] Add a note to the vars file for autoscaling (#215) The note explains why os-net-config is skipped Rename tasks for XML reporting (#181) * [ansible-lint] Update the config to ignore templates in task names * [telemetry_logging] Update task names for XML reporting * [common] Update task names for XML reporting * [common] Update the name for the pod tests to include the status_string and namespace that the pod is running in Add files to the zuul jobs Add files to the zuul jobs uncomment zuul.yaml Add ceilometer_power_state to Metrics_verification test (#221) * Add test Ceilometer_power_state * Add the master_image to the zuul file * Add the master_image to the zuul file Add pod tests for Completed pods in the OpenStack namespace (#214) * [ci] Add logging tests: completed pods in openstack namespace * [ci] logging tests: update names for completed pods in openstack namespace * [ci] logging: update typo on pod name * [ci] Update pod list for completed status in openstack namespace This repo-setup-edpm-deployment-openstack-edpm-ipam doesn't need to be checked. --------- Co-authored-by: Alex Yefimov <[email protected]> [ci][logging] Add tests for services in the openstack namespace (#225) Co-authored-by: Alex Yefimov <[email protected]> [ci] Add endpoint tests to the logging job (#220) * [ci] Add endpoint tests to the logging job The test checks for the various openstack endpoints that we expect to exist Co-authored-by: "Alex Yefimov <[email protected]>" * [ci] Add vars/osp18_env to the logging playbook It contains the "openstack_cmd" var required for the endpoint tests * [common] Add documentation and default for openstack_cmd Fix kepler metrics tests (#224) Kepler metrics tests were added in [1] though the merged commit was not the correct one. This PR aplies changes from [2] that had more correct code of the tests. Fixes OSPRH-14029 [1] #193 [2] 0b5d856 Co-authored-by: Jaromír Wysoglad <[email protected]> Change required projects The projects should contain "github.com/" prefix. Fix rabbitmq test [zuul][graphing] Add the new dashboards to the test (#222) * Add the new dashboards to zuul job Update .zuul.yaml [ci] Add manifest tests to logging job (#228) Co-authored-by: Alex Yefimov <[email protected]> [telemetry_verify_metrics]: add openstack-network-exporter feature tests (#231) * feature_tests: add openstack-network-exporter feature tests Add tests for operator of openstack-network-exporter Signed-off-by: Aaron T. Smith <[email protected]> Co-authored-by: Aaron T. Smith <[email protected]> Co-authored-by: Jaromír Wysoglad <[email protected]> Add to irrelevant_files list for graphing, logging and autoscaling jobs
1 parent 59e50c1 commit 640970d

31 files changed

+360
-99
lines changed

.ansible-lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ skip_list:
66
- command-instead-of-module # Using command rather than module
77
- galaxy
88
- meta-no-info # meta/main.yml should contain relevant info
9+
- name[template] # Jinja templates should only be at the end of 'name'
910
- risky-shell-pipe # Shells that use pipes should set the pipefail option
1011
- unnamed-task # All tasks should be named
1112
- var-naming[no-role-prefix] # Variables names from within roles should use role_name_ as a prefix

.zuul.yaml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
1111
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
1212
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-functional-test.yml"
13+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml"
1314
roles:
1415
- zuul: github.com/openstack-k8s-operators/ci-framework
1516
required-projects: &required_projects
1617
- name: github.com/infrawatch/service-telemetry-operator
17-
- name: openstack-k8s-operators/ci-framework
18+
- name: github.com/openstack-k8s-operators/ci-framework
1819
override-checkout: main
19-
- name: openstack-k8s-operators/install_yamls
20+
- name: github.com/openstack-k8s-operators/install_yamls
2021
override-checkout: main
2122
- name: github.com/openstack-k8s-operators/dataplane-operator
2223
override-checkout: main
@@ -43,6 +44,15 @@
4344
- roles/test_sensubility/.*
4445
- roles/test_snmp_traps/.*
4546
- roles/test_verify_email/.*
47+
files:
48+
- roles/telemetry_autoscaling/.*
49+
- .zuul.yaml
50+
- ci/vars-functional-test.yml
51+
- ci/run_autoscaling_osp18.yml
52+
- ci/vars-use-master-containers.yml
53+
- ci/use-master-containers.yml
54+
- ci/patch-openstack-version.yaml
55+
- scenarios/centos-9/multinode-ci.yml
4656

4757
- job:
4858
name: functional-logging-tests-osp18
@@ -57,7 +67,15 @@
5767
roles:
5868
- zuul: github.com/openstack-k8s-operators/ci-framework
5969
required-projects: *required_projects
70+
<<<<<<< HEAD
6071
irrelevant-files: *irrelevant_files
72+
files:
73+
- roles/telemetry_logging/.*
74+
- .zuul.yaml
75+
- ci/vars-logging-test.yml
76+
- ci/logging_tests_all.yml
77+
- ci/logging_tests_computes.yml
78+
- ci/logging_tests_controller.yml
6179

6280
- job:
6381
name: functional-metric-verification-tests-osp18
@@ -70,10 +88,17 @@
7088
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
7189
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
7290
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-metric-verification-test.yml"
91+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml"
92+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml"
7393
roles:
7494
- zuul: github.com/openstack-k8s-operators/ci-framework
7595
required-projects: *required_projects
76-
irrelevant-files: *irrelevant_files
96+
irrelevant-files: *irrelevant_files
97+
files:
98+
- roles/telemetry_verify_metrics/.*
99+
- .zuul.yaml
100+
- ci/vars-metric-verification-test.yml
101+
- ci/run_verify_metrics_osp18.yml
77102

78103
- job:
79104
name: feature-verification-tests-noop
@@ -95,12 +120,17 @@
95120
cifmw_extras:
96121
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
97122
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
123+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml"
98124
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-graphing-test.yml"
99125
roles:
100126
- zuul: github.com/openstack-k8s-operators/ci-framework
101127
required-projects: *required_projects
102128
irrelevant-files: *irrelevant_files
103-
129+
files:
130+
- roles/telemetry_graphing/.*
131+
- .zuul.yaml
132+
- ci/vars-graphing-test.yml
133+
- ci/run_graphing_test.yml
104134

105135
- project:
106136
name: infrawatch/feature-verification-tests
@@ -111,7 +141,7 @@
111141
override-checkout: main
112142
irrelevant-files: *irrelevant_files
113143
- functional-tests-on-osp18:
114-
voting: false
144+
voting: true
115145
- functional-logging-tests-osp18
116146
- functional-graphing-tests-osp18
117147
- functional-metric-verification-tests-osp18

ci/logging_tests_computes.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@
1111
journal_list:
1212
- ceilometer_agent_compute
1313
- nova_compute
14+
common_file_test_id: "RHOSO-12754"
15+
common_file_list:
16+
- /etc/rsyslog.d/10-telemetry.conf
1417
tasks:
1518
- name: "Run Telemetry Logging tests"
1619
ansible.builtin.import_role:
1720
name: telemetry_logging
21+
22+
- name: "Run the tests from the common role"
23+
ansible.builtin.import_role:
24+
name: common

ci/logging_tests_controller.yml

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
environment:
77
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
88
PATH: "{{ cifmw_path }}"
9+
vars_files:
10+
- vars/osp18_env.yml
911
vars:
10-
common_pod_test_id: "RHOS0-12672"
12+
common_pod_test_id: "RHOSO-12672"
1113
common_pod_status_str: "Running"
1214
common_pod_nspace: openstack-operators
1315
common_pod_list:
@@ -23,6 +25,30 @@
2325
- openshift
2426
- openstack-operators
2527
- openshift-logging
28+
common_endpoint_test_id: "RHOSO-12682"
29+
common_endpoint_list:
30+
- [nova,compute,public]
31+
- [nova,compute,internal]
32+
- [placement,placement,public]
33+
- [placement,placement,internal]
34+
- [swift,object-store,public]
35+
- [swift,object-store,internal]
36+
- [cinderv3,volumev3,public]
37+
- [cinderv3,volumev3,internal]
38+
- [barbican,key-manager,public]
39+
- [barbican,key-manager,internal]
40+
- [keystone,identity,public]
41+
- [keystone,identity,internal]
42+
- [glance,image,public]
43+
- [glance,image,internal]
44+
- [neutron,network,public]
45+
- [neutron,network,internal]
46+
47+
common_manifest_test_id: "RHOSO-12677"
48+
common_manifest_list:
49+
- "loki-operator 2"
50+
- "loki-helm-operator 1"
51+
2652
common_service_test_id: "RHOSO-12675"
2753
common_service_nspace: openshift-logging
2854
common_service_list:
@@ -42,9 +68,6 @@
4268
- logging-loki-query-frontend-grpc
4369
- logging-loki-query-frontend-http
4470
- openstack-logging
45-
common_file_test_id: "RHOSO-12754"
46-
common_file_list:
47-
- /etc/rsyslog.d/10-telemetry.conf
4871
tasks:
4972
- name: "Verify logging infrastructure components"
5073
ansible.builtin.import_role:
@@ -146,7 +169,22 @@
146169
common_pod_nspace: openstack
147170
common_pod_status_str: "Completed"
148171
common_pod_list:
172+
- bootstrap-edpm-deployment-openstack-edpm-ipam
173+
- configure-network-edpm-deployment-openstack-edpm-ipam
174+
- configure-os-edpm-deployment-openstack-edpm-ipam
175+
- download-cache-edpm-deployment-openstack-edpm-ipam
176+
- install-certs-edpm-deployment-openstack-edpm-ipam
177+
- install-os-edpm-deployment-openstack-edpm-ipam
178+
- libvirt-edpm-deployment-openstack-edpm-ipam
149179
- logging-edpm-deployment-openstack-edpm-ipam
180+
- neutron-metadata-edpm-deployment-openstack-edpm-ipam
181+
- nova-edpm-deployment-openstack-edpm-ipam
182+
- ovn-edpm-deployment-openstack-edpm-ipam
183+
- reboot-os-edpm-deployment-openstack-edpm-ipam
184+
- run-os-edpm-deployment-openstack-edpm-ipam
185+
- ssh-known-hosts-edpm-deployment
186+
- telemetry-edpm-deployment-openstack-edpm-ipam
187+
- validate-network-edpm-deployment-openstack-edpm-ipam
150188
tasks:
151189
- name: "Run pods completed tests"
152190
ansible.builtin.import_role:
@@ -160,13 +198,20 @@
160198
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
161199
PATH: "{{ cifmw_path }}"
162200
vars:
201+
common_service_test_id: "RHOSO-12749"
202+
common_service_nspace: openstack
203+
common_service_list:
204+
- nova-internal
205+
- nova-metadata-internal
206+
- nova-novncproxy-cell1-public
207+
- nova-public
163208
common_crd_test_id: "RHOSO-12670"
164209
common_crd_list:
165210
- alertingrules.loki.grafana.com
166211
- lokistacks.loki.grafana.com
167212
- recordingrules.loki.grafana.com
168213
- rulerconfigs.loki.grafana.com
169214
tasks:
170-
- name: "Run the crds tests"
215+
- name: "Run Services and CRD tests"
171216
ansible.builtin.import_role:
172217
name: common

ci/run_autoscaling_osp18.yml

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,6 @@
2020
tags:
2121
- setup
2222

23-
- name: Patch the openstackversions to use the master containers for aodh and heat
24-
ansible.builtin.shell:
25-
cmd: |
26-
oc patch openstackversions controlplane --type merge --patch-file ci/patch-openstack-versions.yaml
27-
chdir: "{{ fvt_dir }}"
28-
when: "{{ patch_openstackversions | bool }}"
29-
tags:
30-
- setup
31-
32-
- name: Redeploy the dataplane
33-
ansible.builtin.shell:
34-
cmd: |
35-
oc get osdpd edpm-deployment -oyaml > /tmp/osdpd.yaml
36-
oc delete osdpd edpm-deployment
37-
sleep 10
38-
oc apply -f /tmp/osdpd.yaml
39-
when: "{{ patch_openstackversions | bool }}"
40-
tags:
41-
- setup
42-
4323
- name: Patch observabilityclient into openstackclient
4424
ansible.builtin.shell:
4525
cmd: |
@@ -50,50 +30,7 @@
5030
tags:
5131
- setup
5232

53-
- name: Wait until the oscp is resolved the changes to continue
54-
ansible.builtin.shell:
55-
cmd: |
56-
oc get oscp | grep "Setup complete"
57-
retries: 24
58-
timeout: 5
59-
until: output.stdout_lines | length == 1
60-
register: output
61-
when: "{{ patch_openstackversions | bool }}"
62-
tags:
63-
- setup
64-
65-
- name: Wait until the osdpd is redeployed to continue
66-
ansible.builtin.shell:
67-
cmd: |
68-
oc get osdpd | grep "Setup complete"
69-
retries: 60
70-
delay: 45
71-
until: output.stdout_lines | length == 1
72-
register: output
73-
when: "{{ patch_openstackversions | bool }}"
74-
tags:
75-
- setup
76-
7733
- name: "Run Telemetry Autoscaling tests"
7834
ansible.builtin.import_role:
7935
name: telemetry_autoscaling
8036
ignore_errors: true
81-
82-
always:
83-
- name: Revert the version update
84-
ansible.builtin.shell:
85-
cmd: |
86-
oc patch openstackversions controlplane --type json -p='[{"op": "replace", "path": "/spec/customContainerImages", "value": {} }]'
87-
when: "{{ patch_openstackversions | bool }}"
88-
89-
- name: Redeploy the dataplane
90-
ansible.builtin.shell:
91-
cmd: |
92-
oc get osdpd edpm-deployment -oyaml > /tmp/osdpd.yaml
93-
oc delete osdpd edpm-deployment
94-
sleep 10
95-
oc apply -f /tmp/osdpd.yaml
96-
when: "{{ patch_openstackversions | bool }}"
97-
tags:
98-
- setup
99-

ci/use-master-containers.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- name: Run telemetry autoscaling tests on osp18
2+
hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
3+
gather_facts: true
4+
environment:
5+
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
6+
PATH: "{{ cifmw_path }}"
7+
vars_files:
8+
- vars/common.yml
9+
- vars/osp18_env.yml
10+
tasks:
11+
- name: Patch the openstackversions to use the master containers for aodh, heat and ceilometer
12+
ansible.builtin.shell:
13+
cmd: |
14+
oc patch openstackversions controlplane --type merge --patch-file ci/patch-openstack-versions.yaml
15+
chdir: "{{ fvt_dir }}"
16+
tags:
17+
- setup
18+

ci/vars-functional-test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
---
2-
# temp: skip os-net-setup
2+
# This is added so we skip the os_net_setup role, which would normally be used
3+
# to create a network.
4+
# A network gets created by `make edpm_deploy_instance` during the autoscaling
5+
# tests.
6+
# skip os-net-setup
37
cifmw_os_net_setup_config: []
48
post_deploy_00_run_functional_test:
59
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_autoscaling_osp18.yml"

ci/vars-use-master-containers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
post_ctlplane_deploy_99_modify_openstackversions:
3+
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/use-master-containers.yml"
4+
type: playbook

roles/common/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ For endpoint_tests.yml tasks:
5858
- polarion ID number for each test.
5959
common_endpoint_list
6060
- list of endpoints to validate
61-
61+
openstack_cmd
62+
- The command used to run openstack
6263

6364
For project_tests.yml tasks:
6465

@@ -155,6 +156,8 @@ can be set at the play level.
155156
- ceilometer_agent_compute
156157
- ceilometer_agent_ipmi
157158
- node_exporter
159+
- kepler
160+
- openstack_network_exporter
158161

159162
- name: "Verify Endpoint"
160163
ansible.builtin.import_role:
@@ -174,7 +177,7 @@ can be set at the play level.
174177
common_project_list:
175178
- openshift-openstack-infra
176179
- openshift
177-
180+
178181
- name: "Verify services"
179182
ansible.builtin.import_role:
180183
name: common

roles/common/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
openstack_cmd: "openstack"

0 commit comments

Comments
 (0)