Skip to content

Commit f550734

Browse files
committed
Delete RHOSO Test id's in roles/common/tasks fvt tests
1 parent aa24ab2 commit f550734

File tree

13 files changed

+2
-61
lines changed

13 files changed

+2
-61
lines changed

roles/common/README.md

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Variable required for all tasks to run
2626

2727
For pod_tests.yml tasks:
2828

29-
common_pod_test_id
30-
- polarion ID number for each test.
3129
common_pod_list
3230
- list of pods to validate
3331
common_pod_status_str
@@ -38,63 +36,47 @@ For pod_tests.yml tasks:
3836

3937
For subscription_tests.yml tasks:
4038

41-
common_subscription_test_id
42-
- polarion ID number for each test
4339
common_subscription_nspace
4440
- namespace
4541
common_subscription_list
4642
- list of subscription to validate
4743

4844
For crd_tests.yml tasks:
4945

50-
common_crd_test_id
51-
- polarion ID number for each test.
5246
common_crd_list
5347
- list of crd to validate
5448

5549
For endpoint_tests.yml tasks:
5650

57-
common_endpoint_test_id
58-
- polarion ID number for each test.
5951
common_endpoint_list
6052
- list of endpoints to validate
6153
openstack_cmd
6254
- The command used to run openstack
6355

6456
For project_tests.yml tasks:
6557

66-
common_project_test_id
67-
- polarion ID number for each test
6858
common_project_list
6959
- list of projects to validate
7060

7161
For service_tests.yml tasks:
7262

73-
common_service_test_id
74-
- polarion ID number for each test
7563
common_service_nspace
7664
- namespace
7765
common_service_list
7866
- list of services to validate
7967

8068
For file_tests.yml tasks:
8169

82-
common_file_test_id
83-
- polarion ID number for each test
8470
common_file_list
8571
- list of files to validate
8672

8773
For manifest_tests.yml tasks:
8874

89-
manifest_test_id
90-
- polarion ID number for each test
9175
manifest_list
9276
- list of package manifests to validate
9377

9478
For cr\_tests.yml tasks:
9579

96-
common\_cr\_test\_id is defined
97-
- polarion ID number for each test that a CR exists
9880
common\_cr\_list is defined
9981
- list of CRs to check
10082
Each dict should include the following keys: kind, name
@@ -103,8 +85,6 @@ For cr\_tests.yml tasks:
10385
kind: metricstorage
10486
name: metric-storage
10587
condition\_type: Ready
106-
common\_cr\_ready\_test\_id is optionally defined
107-
- polarion ID number for each test of readiness of the CR
10888

10989

11090

@@ -132,7 +112,6 @@ can be set at the play level.
132112
ansible.builtin.import_role:
133113
name: common
134114
vars:
135-
common_pod_test_id: "RHOSO-12752"
136115
common_pod_status_str: "Running"
137116
common_pod_nspace: openstack
138117
common_pod_list:
@@ -142,7 +121,6 @@ can be set at the play level.
142121
ansible.builtin.import_role:
143122
name: common
144123
vars:
145-
common_subscription_test_id: "RHOSO-12678"
146124
common_subscription_nspace: openshift-operators-redhat
147125
common_subscription_l :
148126
- loki-operator
@@ -151,7 +129,6 @@ can be set at the play level.
151129
ansible.builtin.include_role:
152130
name: common
153131
vars:
154-
common_container_test_id: "RHOSO-12753"
155132
common_container_list:
156133
- ceilometer_agent_compute
157134
- ceilometer_agent_ipmi
@@ -163,7 +140,6 @@ can be set at the play level.
163140
ansible.builtin.import_role:
164141
name: common
165142
vars:
166-
common_endpoint_test_id: "RHOSO-12682"
167143
common_endpoint_list:
168144
- [nova,compute,public]
169145
- [nova,compute,internal]
@@ -173,7 +149,6 @@ can be set at the play level.
173149
ansible.builtin.import_role:
174150
name: common
175151
vars:
176-
common_project_test_id: "RHOSO-12668"
177152
common_project_list:
178153
- openshift-openstack-infra
179154
- openshift
@@ -182,7 +157,6 @@ can be set at the play level.
182157
ansible.builtin.import_role:
183158
name: common
184159
vars:
185-
common_service_test_id: "RHOSO-12675"
186160
common_service_nspace: openshift-logging
187161
common_service_list:
188162
- cluster-logging-operator-metrics
@@ -207,15 +181,13 @@ can be set at the play level.
207181
ansible.builtin.import_role:
208182
name: common
209183
vars:
210-
common_file_test_id: "RHOSO-12754"
211184
common_file_list:
212185
- /etc/rsyslog.d/10-telemetry.conf
213186

214187
- name: "Verify crd"
215188
ansible.builtin.import_role:
216189
name: common
217190
vars:
218-
common_crd_test_id : "crd_test_id"
219191
common_crd_list:
220192
- list of crd to validate
221193

roles/common/defaults/main.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
---
2-
openstack_cmd: "openstack"
3-
4-
common_crd_test_id: "RHOSO-XXXX"
5-
common_cr_test_id: "RHOSO-XXXX"
6-
common_cr_ready_test_id: "RHOSO-XXXX"
7-
common_container_test_id: "RHOSO-XXXX"
8-
common_endpoint_test_id: "RHOSO-XXXX"
9-
common_file_test_id: "RHOSO-XXXX"
10-
common_manifest_test_id: "RHOSO-XXXX"
11-
common_pod_test_id: "RHOSO-XXXX"
12-
common_project_test_id: "RHOSO-XXXX"
13-
common_service_test_id: "RHOSO-XXXX"
14-
common_subscription_test_id: "RHOSO-XXXX"
2+
openstack_cmd: "openstack"

roles/common/tasks/container_test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
- name: |
2727
TEST Verify {{ container_name }} container status
28-
{{ common_container_test_id }}
2928
ansible.builtin.assert:
3029
that:
3130
- "container_status.stdout | length != 0"

roles/common/tasks/cr_tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
- name: |
33
TEST Verify that the {{ item.kind }} {{ item.name }} CR exists
4-
{{ common_cr_test_id }}
54
ansible.builtin.command:
65
cmd: |
76
oc get {{ item.kind }} {{ item.name }}
@@ -10,7 +9,7 @@
109
failed_when:
1110
- result.rc != 0
1211

13-
- name: Verify that a CR is ready {{ common_cr_ready_test_id }}
12+
- name: Verify that a CR is ready
1413
ansible.builtin.command:
1514
cmd: |
1615
oc get {{ item.kind }} {{ item.name }} -o jsonpath='{.status.conditions[?(@.type=="{{ item.condition_type }}")].status}{"\n"}'
@@ -19,5 +18,4 @@
1918
failed_when:
2019
- result.stdout != "True"
2120
when:
22-
- common_cr_ready_test_id is defined
2321
- item.condition_type is defined

roles/common/tasks/crd_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
- name: |
1010
TEST Verify CRD {{ item }} is found
11-
{{ common_crd_test_id }}
1211
ansible.builtin.assert:
1312
that:
1413
- "'NotFound' not in output.stderr"

roles/common/tasks/endpoint_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
- name: |
1010
TEST Check that {{ item[0] }} {{ item[2] }} endpoint exists
11-
{{ common_endpoint_test_id }}
1211
ansible.builtin.assert:
1312
that:
1413
- output.stdout != ""

roles/common/tasks/file_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
- name: |
88
TEST Verify the file {{ item }} exists
9-
{{ common_file_test_id }}
109
ansible.builtin.assert:
1110
that:
1211
- fstats.stat.exists

roles/common/tasks/main.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
- name: "Run pod tests"
33
when:
4-
- common_pod_test_id is defined
54
- common_pod_list is defined
65
- common_pod_nspace is defined
76
- common_pod_status_str is defined
@@ -23,51 +22,44 @@
2322

2423
- name: "Run project tests"
2524
when:
26-
- common_project_test_id is defined
2725
- common_project_list is defined
2826
ansible.builtin.include_tasks: "project_tests.yml"
2927
loop: "{{ common_project_list }}"
3028

3129
- name: "Run service tests"
3230
when:
33-
- common_service_test_id is defined
3431
- common_service_nspace is defined
3532
- common_service_list is defined
3633
ansible.builtin.include_tasks: "service_tests.yml"
3734
loop: "{{ common_service_list }}"
3835

3936
- name: "Run file tests"
4037
when:
41-
- common_file_test_id is defined
4238
- common_file_list is defined
4339
ansible.builtin.include_tasks: "file_tests.yml"
4440
loop: "{{ common_file_list }}"
4541

4642
- name: "Run manifest tests"
4743
when:
48-
- common_manifest_test_id is defined
4944
- common_manifest_list is defined
5045
ansible.builtin.include_tasks: "manifest_tests.yml"
5146
loop: "{{ common_manifest_list }}"
5247

5348
- name: "Run crd tests"
5449
when:
55-
- common_crd_test_id is defined
5650
- common_crd_list is defined
5751
ansible.builtin.include_tasks: "crd_tests.yml"
5852
loop: "{{ common_crd_list }}"
5953

6054
- name: "Run CR tests"
6155
when:
62-
- common_cr_test_id is defined
6356
- common_cr_list is defined
6457
ansible.builtin.include_tasks: "cr_tests.yml"
6558
loop: "{{ common_cr_list }}"
6659

6760
- name: "Verify container tests"
6861
when:
6962
- common_container_list is defined
70-
- common_container_test_id is defined
7163
ansible.builtin.include_tasks: "container_test.yml"
7264
loop: "{{ common_container_list }}"
7365
loop_control:

roles/common/tasks/manifest_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
- name: |
1717
TEST Get {{ item }} packagemanifest
18-
{{ common_manifest_test_id }}
1918
ansible.builtin.shell:
2019
cmd: |
2120
oc get packagemanifests | grep "{{ pack_name.stdout }}" | wc -l

roles/common/tasks/pod_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
- name: |
1515
TEST Check {{ item }} pod is {{ common_pod_status_str }} in {{ common_pod_nspace }} namespace
16-
{{ common_pod_test_id }}
1716
ansible.builtin.command:
1817
cmd: |
1918
oc get pod -n "{{ common_pod_nspace }}" "{{ podinstance.stdout }}"

0 commit comments

Comments
 (0)