Skip to content

Commit b3778e5

Browse files
committed
Read group_vars/all.yml in each nested Ansible execution in ci playbooks
Some of the CI jobs, even when ansible-playbook execution is done from ci-framework dir, does not read group_vars/all.yml variable file. That's because the playbook execution require to have symlink to the group_vars in the playbook dir. Until we still have nested ansible execution available in ci-framework, we should read the all.yml file using ansible extra vars parameters instead of relay that there should be symlink done in this dir. Signed-off-by: Daniel Pawlik <[email protected]>
1 parent 8c75c50 commit b3778e5

File tree

17 files changed

+20
-0
lines changed

17 files changed

+20
-0
lines changed

ci/playbooks/architecture/run.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
cmd: >-
1717
ansible-playbook -i localhost, -c local
1818
ci/playbooks/architecture/validate-architecture.yml
19+
-e @group_vars/all.yml
1920
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"

ci/playbooks/architecture/validate-architecture.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Usage and expected parameters
33
# $ ansible-playbook -i localhost, -c local \
44
# validate-architecture.yml \
5+
# -e @group_vars/all.yml \
56
# -e cifmw_architecture_repo=$HOME/architecture \
67
# -e cifmw_architecture_scenario=hci \
78
# -e cifmw_networking_mapper_networking_env_def_path=$HOME/net-env.yml

ci/playbooks/bootstrap-networking-mapper.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
cmd: >-
2222
~/test-python/bin/ansible-playbook {{ ansible_user_dir }}/networking_mapper.yml
2323
-i {{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml
24+
-e @group_vars/all.yml
2425
-e @scenarios/centos-9/base.yml
2526
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"
2627
-e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.yml

ci/playbooks/build_push_container_runner.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
cmd: >-
1111
~/test-python/bin/ansible-playbook ci/playbooks/build_push_container.yml
1212
-i {{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml
13+
-e @group_vars/all.yml
1314
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"

ci/playbooks/content_provider/run.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
cmd: >-
1919
ansible-playbook -i localhost,
2020
-c local ci/playbooks/content_provider/content_provider.yml
21+
-e @group_vars/all.yml
2122
-e @scenarios/centos-9/base.yml
2223
-e @scenarios/centos-9/content_provider.yml
2324
-e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml"

ci/playbooks/e2e-run.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
cmd: >-
1212
ansible-playbook deploy-edpm.yml
1313
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
14+
-e @group_vars/all.yml
1415
-e @scenarios/centos-9/base.yml
1516
-e @scenarios/centos-9/install_yamls.yml
1617
{%- if cifmw_extras is defined %}
@@ -32,6 +33,7 @@
3233
cmd: >-
3334
ansible-playbook deploy-edpm.yml
3435
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
36+
-e @group_vars/all.yml
3537
-e @scenarios/centos-9/base.yml
3638
-e @scenarios/centos-9/install_yamls.yml
3739
{%- if cifmw_extras is defined %}
@@ -54,6 +56,7 @@
5456
cmd: >-
5557
ansible-playbook deploy-edpm.yml
5658
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
59+
-e @group_vars/all.yml
5760
-e @scenarios/centos-9/base.yml
5861
-e @scenarios/centos-9/install_yamls.yml
5962
{%- if cifmw_extras is defined %}

ci/playbooks/edpm/run.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
cmd: >-
2929
ansible-playbook deploy-edpm.yml
3030
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
31+
-e @group_vars/all.yml
3132
-e @scenarios/centos-9/base.yml
3233
-e @scenarios/centos-9/edpm_ci.yml
3334
{%- if edpm_file.stat.exists %}
@@ -46,6 +47,7 @@
4647
cmd: >-
4748
ansible-playbook post-deployment.yml
4849
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
50+
-e @group_vars/all.yml
4951
-e @scenarios/centos-9/base.yml
5052
-e @scenarios/centos-9/edpm_ci.yml
5153
{%- if edpm_file.stat.exists %}

ci/playbooks/edpm/update.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
cmd: >-
2222
ansible-playbook update-edpm.yml
2323
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
24+
-e @group_vars/all.yml
2425
-e @scenarios/centos-9/base.yml
2526
-e @scenarios/centos-9/edpm_ci.yml
2627
{%- if edpm_file.stat.exists %}

ci/playbooks/edpm_baremetal_deployment/run.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
cmd: >-
6060
ansible-playbook deploy-edpm.yml
6161
-i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml"
62+
-e @group_vars/all.yml
6263
-e @scenarios/centos-9/base.yml
6364
-e @scenarios/centos-9/edpm_baremetal_deployment_ci.yml
6465
{%- if edpm_file.stat.exists %}

ci/playbooks/edpm_build_images/edpm_build_images_content_provider_run.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
cmd: >-
1919
ansible-playbook -i localhost, -c local
2020
ci/playbooks/edpm_build_images/edpm_build_images_content_provider.yaml
21+
-e @group_vars/all.yml
2122
-e @scenarios/centos-9/base.yml
2223
{%- if cifmw_extras is defined %}
2324
{%- for extra_vars in cifmw_extras %}

0 commit comments

Comments
 (0)