fix leftovers

openstack-k8s-operators · Nov 4, 2024 · f8e1aa1 · f8e1aa1
1 parent 125e387
commit f8e1aa1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml
@@ -47,7 +47,7 @@ cifmw_test_operator_tempest_name: "tempest-tests"
 cifmw_test_operator_tempest_registry: quay.io
 cifmw_test_operator_tempest_namespace: podified-antelope-centos9
 cifmw_test_operator_tempest_container: openstack-tempest-all
-cifmw_test_operator_tempest_image: "{{ _test_operator_tempest_registry }}/{{ _test_operator_tempest_namespace }}/{{ _test_operator_tempest_container }}"
+cifmw_test_operator_tempest_image: "{{ cifmw_test_operator_tempest_registry }}/{{ cifmw_test_operator_tempest_namespace }}/{{ cifmw_test_operator_tempest_container }}"
 cifmw_test_operator_tempest_image_tag: current-podified
 cifmw_test_operator_tempest_network_attachments: []
 cifmw_test_operator_tempest_tests_include_override_scenario: false
@@ -108,7 +108,7 @@ cifmw_test_operator_tempest_config:
     namespace: "{{ cifmw_test_operator_namespace }}"
   spec:
     SELinuxLevel: "{{ cifmw_test_operator_selinux_level }}"
-    containerImage: "{{ stage_vars_dict.cifmw_test_operator_tempest_image }}:{{ stage_vars_dict.cifmw_test_operator_tempest_image_tag }}"
+    containerImage: "{{ test_operator_image }}:{{ stage_vars_dict.cifmw_test_operator_tempest_image_tag }}"
     storageClass: "{{ cifmw_test_operator_storage_class }}"
     privileged: "{{ cifmw_test_operator_privileged }}"
     parallel: "{{ stage_vars_dict.cifmw_test_operator_tempest_parallel | default(omit) }}"
@@ -137,7 +137,7 @@ cifmw_test_operator_tobiko_name: "tobiko-tests"
 cifmw_test_operator_tobiko_registry: quay.io
 cifmw_test_operator_tobiko_namespace: podified-antelope-centos9
 cifmw_test_operator_tobiko_container: openstack-tobiko
-cifmw_test_operator_tobiko_image: "{{ _test_operator_tobiko_registry }}/{{ _test_operator_tobiko_namespace }}/{{ _test_operator_tobiko_container }}"
+cifmw_test_operator_tobiko_image: "{{ stage_vars_dict.cifmw_test_operator_tobiko_registry }}/{{ stage_vars_dict.cifmw_test_operator_tobiko_namespace }}/{{ stage_vars_dict.cifmw_test_operator_tobiko_container }}"
 cifmw_test_operator_tobiko_image_tag: current-podified
 cifmw_test_operator_tobiko_testenv: scenario
 cifmw_test_operator_tobiko_version: master
@@ -161,7 +161,7 @@ cifmw_test_operator_tobiko_config:
     kubeconfigSecretName: "{{ stage_vars_dict.cifmw_test_operator_tobiko_kubeconfig_secret }}"
     storageClass: "{{ cifmw_test_operator_storage_class }}"
     privileged: "{{ cifmw_test_operator_privileged }}"
-    containerImage: "{{ stage_vars_dict.cifmw_test_operator_tobiko_image }}:{{ stage_vars_dict.cifmw_test_operator_tobiko_image_tag }}"
+    containerImage: "{{ test_operator_image }}:{{ stage_vars_dict.cifmw_test_operator_tobiko_image_tag }}"
     testenv: "{{ stage_vars_dict.cifmw_test_operator_tobiko_testenv }}"
     version: "{{ stage_vars_dict.cifmw_test_operator_tobiko_version }}"
     pytestAddopts: "{{ stage_vars_dict.cifmw_test_operator_tobiko_pytest_addopts if stage_vars_dict.cifmw_test_operator_tobiko_pytest_addopts is not none else omit }}"
@@ -180,7 +180,7 @@ cifmw_test_operator_ansibletest_name: "ansibletest"
 cifmw_test_operator_ansibletest_registry: quay.io
 cifmw_test_operator_ansibletest_namespace: podified-antelope-centos9
 cifmw_test_operator_ansibletest_container: openstack-ansible-tests
-cifmw_test_operator_ansibletest_image: "{{ _test_operator_ansibletest_registry }}/{{ _test_operator_ansibletest_namespace }}/{{ _test_operator_ansibletest_container }}"
+cifmw_test_operator_ansibletest_image: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_registry }}/{{ stage_vars_dict.cifmw_test_operator_ansibletest_namespace }}/{{ stage_vars_dict.cifmw_test_operator_ansibletest_container }}"
 cifmw_test_operator_ansibletest_image_tag: current-podified
 cifmw_test_operator_ansibletest_compute_ssh_key_secret_name: "dataplane-ansible-ssh-private-key-secret"
 cifmw_test_operator_ansibletest_workload_ssh_key_secret_name: ""
@@ -203,7 +203,7 @@ cifmw_test_operator_ansibletest_config:
     namespace: "{{ cifmw_test_operator_namespace }}"
   spec:
     SELinuxLevel: "{{ cifmw_test_operator_selinux_level }}"
-    containerImage: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_image }}:{{ stage_vars_dict.cifmw_test_operator_ansibletest_image_tag }}"
+    containerImage: "{{ test_operator_image }}:{{ stage_vars_dict.cifmw_test_operator_ansibletest_image_tag }}"
     extraConfigmapsMounts: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_extra_configmaps_mounts }}"
     storageClass: "{{ cifmw_test_operator_storage_class }}"
     privileged: "{{ cifmw_test_operator_privileged }}"
@@ -225,7 +225,7 @@ cifmw_test_operator_horizontest_name: "horizontest-tests"
 cifmw_test_operator_horizontest_registry: quay.io
 cifmw_test_operator_horizontest_namespace: podified-antelope-centos9
 cifmw_test_operator_horizontest_container: openstack-horizontest
-cifmw_test_operator_horizontest_image: "{{ _test_operator_horizontest_registry }}/{{ _test_operator_horizontest_namespace }}/{{ _test_operator_horizontest_container }}"
+cifmw_test_operator_horizontest_image: "{{ stage_vars_dict.cifmw_test_operator_horizontest_registry }}/{{ stage_vars_dict.cifmw_test_operator_horizontest_namespace }}/{{ stage_vars_dict.cifmw_test_operator_horizontest_container }}"
 cifmw_test_operator_horizontest_image_tag: current-podified
 cifmw_test_operator_horizontest_admin_username: admin
 cifmw_test_operator_horizontest_admin_password: "12345678"
@@ -250,7 +250,7 @@ cifmw_test_operator_horizontest_config:
     SELinuxLevel: "{{ cifmw_test_operator_selinux_level }}"
     storageClass: "{{ cifmw_test_operator_storage_class }}"
     privileged: "{{ cifmw_test_operator_privileged }}"
-    containerImage: "{{ stage_vars_dict.cifmw_test_operator_horizontest_image }}:{{ stage_vars_dict.cifmw_test_operator_horizontest_image_tag }}"
+    containerImage: "{{ test_operator_image }}:{{ stage_vars_dict.cifmw_test_operator_horizontest_image_tag }}"
     adminUsername: "{{ stage_vars_dict.cifmw_test_operator_horizontest_admin_username }}"
     adminPassword: "{{ stage_vars_dict.cifmw_test_operator_horizontest_admin_password }}"
     dashboardUrl: "{{ stage_vars_dict.cifmw_test_operator_horizontest_dashboard_url }}"

diff --git a/roles/test_operator/tasks/runners/ansibletest_runner.yml b/roles/test_operator/tasks/runners/ansibletest_runner.yml
@@ -3,6 +3,7 @@
   vars:
     run_test_fw: ansibletest
     test_operator_config: "{{ _stage_test_vars.cifmw_test_operator_ansibletest_config | default(cifmw_test_operator_ansibletest_config) }}"
+    test_operator_image: "{{ _stage_test_vars.cifmw_test_operator_ansibletest_image | default(cifmw_test_operator_ansibletest_image) }}"
     test_operator_job_name: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_name }}-{{ _stage_vars.name }}"
     test_operator_kind_name: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_kind_name }}"
     test_operator_crd_name: "{{ stage_vars_dict.cifmw_test_operator_ansibletest_crd_name }}"

diff --git a/roles/test_operator/tasks/runners/horizontest_runner.yml b/roles/test_operator/tasks/runners/horizontest_runner.yml
@@ -3,6 +3,7 @@
   vars:
     run_test_fw: horizontest
     test_operator_config: "{{ _stage_test_vars.cifmw_test_operator_horizontest_config | default(cifmw_test_operator_horizontest_config) }}"
+    test_operator_image: "{{ _stage_test_vars.cifmw_test_operator_horizontest_image | default(cifmw_test_operator_horizontest_image) }}"
     test_operator_job_name: "{{ stage_vars_dict.cifmw_test_operator_horizontest_name }}-{{ _stage_vars.name }}"
     test_operator_kind_name: "{{ stage_vars_dict.cifmw_test_operator_horizontest_kind_name }}"
     test_operator_crd_name: "{{ stage_vars_dict.cifmw_test_operator_horizontest_crd_name }}"

diff --git a/roles/test_operator/tasks/runners/tempest_runner.yml b/roles/test_operator/tasks/runners/tempest_runner.yml
@@ -3,6 +3,7 @@
   vars:
     run_test_fw: tempest
     test_operator_config: "{{ _stage_test_vars.cifmw_test_operator_tempest_config | default(cifmw_test_operator_tempest_config) }}"
+    test_operator_image: "{{ _stage_test_vars.cifmw_test_operator_tempest_image | default(cifmw_test_operator_tempest_image) }}"
     test_operator_job_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_name }}-{{ _stage_vars.name }}"
     test_operator_kind_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_kind_name }}"
     test_operator_crd_name: "{{ stage_vars_dict.cifmw_test_operator_tempest_crd_name }}"

diff --git a/roles/test_operator/tasks/runners/tobiko_runner.yml b/roles/test_operator/tasks/runners/tobiko_runner.yml
@@ -4,6 +4,7 @@
   vars:
     run_test_fw: tobiko
     test_operator_config: "{{ _stage_test_vars.cifmw_test_operator_tobiko_config | default(cifmw_test_operator_tobiko_config) }}"
+    test_operator_image: "{{ _stage_test_vars.cifmw_test_operator_tobiko_image | default(cifmw_test_operator_tobiko_image) }}"
     test_operator_job_name: "{{ stage_vars_dict.cifmw_test_operator_tobiko_name }}-{{ _stage_vars.name }}"
     test_operator_kind_name: "{{ stage_vars_dict.cifmw_test_operator_tobiko_kind_name }}"
     test_operator_crd_name: "{{ stage_vars_dict.cifmw_test_operator_tobiko_crd_name }}"