Skip to content

Commit 86f0d04

Browse files
committed
Added code to load the var.file for ansible integration tests
1 parent 70bbd18 commit 86f0d04

File tree

2 files changed

+7
-9
lines changed
  • ansible/collections/ansible_collections/nhsd/apigee
    • roles/validate_manifest/tasks
    • tests/integration/targets/test_validate_manifest/tasks

2 files changed

+7
-9
lines changed

ansible/collections/ansible_collections/nhsd/apigee/roles/validate_manifest/tasks/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
set_fact:
1919
manifest: "{{ lookup('file', manifest_file ) | from_yaml }}"
2020

21+
22+
- name: Load vars.yml for {{ DIST_DIR }}
23+
include_vars:
24+
file: "{{ DIST_DIR }}/vars.yml"
25+
2126
- name: validate manifest
2227
nhsd.apigee.validate_manifest:
2328
manifest: "{{ manifest }}"

ansible/collections/ansible_collections/nhsd/apigee/tests/integration/targets/test_validate_manifest/tasks/main.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,9 @@
1414
set_fact:
1515
DIST_DIRS: "{{ find_dist_dirs | json_query('files[*].path') | list }}"
1616

17-
1817
- name: validate test manifest files
19-
block:
20-
- name: Load vars.yml for {{ DIST_DIR }}
21-
include_vars:
22-
file: "{{ DIST_DIR }}/vars.yml"
23-
24-
- name: Run validate_manifest role
25-
include_role:
26-
name: validate_manifest
18+
include_role:
19+
name: validate_manifest
2720
loop: "{{ DIST_DIRS }}"
2821
loop_control:
2922
loop_var: DIST_DIR

0 commit comments

Comments
 (0)