Skip to content

Commit fe3aa32

Browse files
committed
[test_operator] Common default values for container images
test-operator currently supports 4 test frameworks: tempest, tobiko, horizontests and ansibletests. The relevant variables required to download their corresponding container images had to be configured separately, but usually were configured with common values. With this PR, default values for registry, namespace and tag can be configured and they apply to the 4 test frameworks.
1 parent eab8350 commit fe3aa32

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

roles/test_operator/defaults/main.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,18 @@ cifmw_test_operator_storage_class: "{{ cifmw_test_operator_storage_class_prefix
3838
cifmw_test_operator_delete_logs_pod: false
3939
cifmw_test_operator_privileged: true
4040
cifmw_test_operator_selinux_level: "s0:c478,c978"
41+
# default testfw registry, namespace and tag can be overriden per testw (tempest, tobiko, horizontest and ansibletest)
42+
cifmw_test_operator_default_registry: quay.io
43+
cifmw_test_operator_default_namespace: podified-antelope-centos9
44+
cifmw_test_operator_default_image_tag: current-podified
4145

4246
# Section 2: tempest parameters - used when run_test_fw is 'tempest'
4347
cifmw_test_operator_tempest_name: "tempest-tests"
44-
cifmw_test_operator_tempest_registry: quay.io
45-
cifmw_test_operator_tempest_namespace: podified-antelope-centos9
48+
cifmw_test_operator_tempest_registry: "{{ cifmw_test_operator_default_registry }}"
49+
cifmw_test_operator_tempest_namespace: "{{ cifmw_test_operator_default_namespace }}"
4650
cifmw_test_operator_tempest_container: openstack-tempest-all
4751
cifmw_test_operator_tempest_image: "{{ cifmw_test_operator_tempest_registry }}/{{ cifmw_test_operator_tempest_namespace }}/{{ cifmw_test_operator_tempest_container }}"
48-
cifmw_test_operator_tempest_image_tag: current-podified
52+
cifmw_test_operator_tempest_image_tag: "{{ cifmw_test_operator_default_image_tag }}"
4953
cifmw_test_operator_tempest_network_attachments: []
5054
cifmw_test_operator_tempest_tests_include_override_scenario: false
5155
cifmw_test_operator_tempest_tests_exclude_override_scenario: false
@@ -133,11 +137,11 @@ cifmw_test_operator_tempest_config:
133137

134138
# Section 3: tobiko parameters - used when run_test_fw is 'tobiko'
135139
cifmw_test_operator_tobiko_name: "tobiko-tests"
136-
cifmw_test_operator_tobiko_registry: quay.io
137-
cifmw_test_operator_tobiko_namespace: podified-antelope-centos9
140+
cifmw_test_operator_tobiko_registry: "{{ cifmw_test_operator_default_registry }}"
141+
cifmw_test_operator_tobiko_namespace: "{{ cifmw_test_operator_default_namespace }}"
138142
cifmw_test_operator_tobiko_container: openstack-tobiko
139143
cifmw_test_operator_tobiko_image: "{{ cifmw_test_operator_tobiko_registry }}/{{ cifmw_test_operator_tobiko_namespace }}/{{ cifmw_test_operator_tobiko_container }}"
140-
cifmw_test_operator_tobiko_image_tag: current-podified
144+
cifmw_test_operator_tobiko_image_tag: "{{ cifmw_test_operator_default_image_tag }}"
141145
cifmw_test_operator_tobiko_testenv: scenario
142146
cifmw_test_operator_tobiko_version: master
143147
cifmw_test_operator_tobiko_pytest_addopts: null
@@ -178,11 +182,11 @@ cifmw_test_operator_tobiko_config:
178182

179183
# Section 4: ansibletest parameters - used when run_test_fw is 'ansibletest'
180184
cifmw_test_operator_ansibletest_name: "ansibletest"
181-
cifmw_test_operator_ansibletest_registry: quay.io
182-
cifmw_test_operator_ansibletest_namespace: podified-antelope-centos9
185+
cifmw_test_operator_ansibletest_registry: "{{ cifmw_test_operator_default_registry }}"
186+
cifmw_test_operator_ansibletest_namespace: "{{ cifmw_test_operator_default_namespace }}"
183187
cifmw_test_operator_ansibletest_container: openstack-ansible-tests
184188
cifmw_test_operator_ansibletest_image: "{{ cifmw_test_operator_ansibletest_registry }}/{{ cifmw_test_operator_ansibletest_namespace }}/{{ cifmw_test_operator_ansibletest_container }}"
185-
cifmw_test_operator_ansibletest_image_tag: current-podified
189+
cifmw_test_operator_ansibletest_image_tag: "{{ cifmw_test_operator_default_image_tag }}"
186190
cifmw_test_operator_ansibletest_compute_ssh_key_secret_name: "dataplane-ansible-ssh-private-key-secret"
187191
cifmw_test_operator_ansibletest_workload_ssh_key_secret_name: ""
188192
cifmw_test_operator_ansibletest_ansible_git_repo: ""
@@ -223,11 +227,11 @@ cifmw_test_operator_ansibletest_config:
223227

224228
# Section 5: horizontest parameters - used when run_test_fw is 'horizontest'
225229
cifmw_test_operator_horizontest_name: "horizontest-tests"
226-
cifmw_test_operator_horizontest_registry: quay.io
227-
cifmw_test_operator_horizontest_namespace: podified-antelope-centos9
230+
cifmw_test_operator_horizontest_registry: "{{ cifmw_test_operator_default_registry }}"
231+
cifmw_test_operator_horizontest_namespace: "{{ cifmw_test_operator_default_namespace }}"
228232
cifmw_test_operator_horizontest_container: openstack-horizontest
229233
cifmw_test_operator_horizontest_image: "{{ cifmw_test_operator_horizontest_registry }}/{{ cifmw_test_operator_horizontest_namespace }}/{{ cifmw_test_operator_horizontest_container }}"
230-
cifmw_test_operator_horizontest_image_tag: current-podified
234+
cifmw_test_operator_horizontest_image_tag: "{{ cifmw_test_operator_default_image_tag }}"
231235
cifmw_test_operator_horizontest_admin_username: admin
232236
cifmw_test_operator_horizontest_admin_password: "12345678"
233237
cifmw_test_operator_horizontest_dashboard_url: "https://horizon-openstack.apps.ocp.openstack.lab/"

0 commit comments

Comments
 (0)