Fixed validate-architecture zuul job

* Fixed file name generation typo in `validate-architecture` playbook * Added the ability of overriding `cifmw_networking_mapper_networking_env_def_path` job Signed-off-by: Roberto Alfieri <[email protected]>
openstack-k8s-operators · Jun 6, 2024 · 8d1092a · 8d1092a
1 parent 327f2db
commit 8d1092a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/ci/playbooks/architecture/validate-architecture.yml b/ci/playbooks/architecture/validate-architecture.yml
@@ -79,13 +79,13 @@
         - name: Copy file on localhost
           delegate_to: localhost
           ansible.builtin.copy:
-            dest: "{{ lookup('env', 'HOME') }}/{{ cifmw_architecture_scenario }}.yml }}"
+            dest: "{{ lookup('env', 'HOME') ~ '/' ~ cifmw_architecture_scenario ~ '.yml' }}"
             mode: "0644"
             content: "{{ _mock_content.content | b64decode }}"
 
         - name: Include var file
           ansible.builtin.include_vars:
-            file: "{{ lookup('env', 'HOME') }}/{{ cifmw_architecture_scenario }}.yml }}"
+            file: "{{ lookup('env', 'HOME') ~ '/' ~ cifmw_architecture_scenario ~ '.yml' }}"
 
     - name: Ensure kustomize_deploy is bootstraped
       ansible.builtin.import_role:

diff --git a/zuul.d/architecture-jobs.yaml b/zuul.d/architecture-jobs.yaml
@@ -9,19 +9,25 @@
     name: cifmw-architecture-validate-base
     parent: cifmw-base-minimal
     vars:
-      cifmw_networking_mapper_networking_env_def_path: >-
-        {{
-          [ansible_user_dir,
-           zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir,
-           'ci/playbooks/files/networking-env-definition.yml']
-           | path_join
-        }}
       cifmw_architecture_repo: >-
         {{
           [ansible_user_dir,
            zuul.projects['github.com/openstack-k8s-operators/architecture'].src_dir]
            | path_join
         }}
+      cifmw_networking_env_def_file_local: >-
+        {{
+          "" if not cifmw_networking_env_def_file else
+          ([ cifmw_architecture_repo,
+            cifmw_networking_env_dev_file ] | path_join)
+        }}
+      cifmw_networking_mapper_networking_env_def_path: >-
+        {{
+          cifmw_networking_env_def_file_local |
+          default([ansible_user_dir,
+          zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir,
+          'ci/playbooks/files/networking-env-definition.yml'] | path_join, true)
+        }}
     run:
       - ci/playbooks/architecture/run.yml
     required-projects: