Use cifmw_architecture_scenario to set proper automation file

openstack-k8s-operators/architecture#375 splits the default vars into different scenario files. We need to fix the reproducer to adapt this change. This pull-request uses cifmw_architecture_scenario to set proper automation file. Depends-On: openstack-k8s-operators/architecture#375 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
openstack-k8s-operators · Aug 29, 2024 · 9db8391 · 9db8391
1 parent 88a6b80
commit 9db8391
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/roles/reproducer/tasks/configure_controller.yml b/roles/reproducer/tasks/configure_controller.yml
@@ -409,7 +409,7 @@
               (
                 cifmw_architecture_repo | default(ansible_user_dir+'/src/github.com/openstack-k8s-operators/architecture'),
                 'automation/vars',
-                cifmw_arch_automation_file | default('default.yaml')
+                cifmw_architecture_scenario+'.yaml'
               ) | ansible.builtin.path_join
             }}
           {% endraw %}

diff --git a/zuul.d/architecture-jobs.yaml b/zuul.d/architecture-jobs.yaml
@@ -49,13 +49,6 @@
     nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-3xl-vexxhost
     vars:
       <<: *architecture_vars
-      cifmw_architecture_automation_file: >-
-        {{
-          (
-            cifmw_architecture_repo,
-            'automation/vars/default.yaml'
-          ) | ansible.builtin.path_join
-        }}
       cifmw_controller_name: controller
       cifmw_openshift_setup_skip_internal_registry_tls_verify: true
       cifmw_networking_env_def_file: "networking-env-definition.yml"