diff --git a/ci/playbooks/architecture/run.yml b/ci/playbooks/architecture/run.yml index 0b45fd5cdb..2b4f968ff4 100644 --- a/ci/playbooks/architecture/run.yml +++ b/ci/playbooks/architecture/run.yml @@ -16,4 +16,5 @@ cmd: >- ansible-playbook -i localhost, -c local ci/playbooks/architecture/validate-architecture.yml + -e @group_vars/all.yml -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml" diff --git a/ci/playbooks/architecture/validate-architecture.yml b/ci/playbooks/architecture/validate-architecture.yml index 283fab317a..3429a600f7 100644 --- a/ci/playbooks/architecture/validate-architecture.yml +++ b/ci/playbooks/architecture/validate-architecture.yml @@ -2,6 +2,7 @@ # Usage and expected parameters # $ ansible-playbook -i localhost, -c local \ # validate-architecture.yml \ +# -e @group_vars/all.yml \ # -e cifmw_architecture_repo=$HOME/architecture \ # -e cifmw_architecture_scenario=hci \ # -e cifmw_networking_mapper_networking_env_def_path=$HOME/net-env.yml diff --git a/ci/playbooks/bootstrap-networking-mapper.yml b/ci/playbooks/bootstrap-networking-mapper.yml index 5d91e085a8..dd5672d498 100644 --- a/ci/playbooks/bootstrap-networking-mapper.yml +++ b/ci/playbooks/bootstrap-networking-mapper.yml @@ -21,6 +21,7 @@ cmd: >- ~/test-python/bin/ansible-playbook {{ ansible_user_dir }}/networking_mapper.yml -i {{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml" -e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.yml diff --git a/ci/playbooks/build_push_container_runner.yml b/ci/playbooks/build_push_container_runner.yml index 957c24808a..adbea8fdb5 100644 --- a/ci/playbooks/build_push_container_runner.yml +++ b/ci/playbooks/build_push_container_runner.yml @@ -10,4 +10,5 @@ cmd: >- ~/test-python/bin/ansible-playbook ci/playbooks/build_push_container.yml -i {{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml + -e @group_vars/all.yml -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml" diff --git a/ci/playbooks/content_provider/run.yml b/ci/playbooks/content_provider/run.yml index 81788f7e03..f73fc24bd0 100644 --- a/ci/playbooks/content_provider/run.yml +++ b/ci/playbooks/content_provider/run.yml @@ -18,6 +18,7 @@ cmd: >- ansible-playbook -i localhost, -c local ci/playbooks/content_provider/content_provider.yml + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/content_provider.yml -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml" diff --git a/ci/playbooks/e2e-run.yml b/ci/playbooks/e2e-run.yml index ebcc50d85d..5b9ef494c1 100644 --- a/ci/playbooks/e2e-run.yml +++ b/ci/playbooks/e2e-run.yml @@ -11,6 +11,7 @@ cmd: >- ansible-playbook deploy-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/install_yamls.yml {%- if cifmw_extras is defined %} @@ -32,6 +33,7 @@ cmd: >- ansible-playbook deploy-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/install_yamls.yml {%- if cifmw_extras is defined %} @@ -54,6 +56,7 @@ cmd: >- ansible-playbook deploy-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/install_yamls.yml {%- if cifmw_extras is defined %} diff --git a/ci/playbooks/edpm/run.yml b/ci/playbooks/edpm/run.yml index e49364271d..29d14ed7aa 100644 --- a/ci/playbooks/edpm/run.yml +++ b/ci/playbooks/edpm/run.yml @@ -28,6 +28,7 @@ cmd: >- ansible-playbook deploy-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/edpm_ci.yml {%- if edpm_file.stat.exists %} @@ -46,6 +47,7 @@ cmd: >- ansible-playbook post-deployment.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/edpm_ci.yml {%- if edpm_file.stat.exists %} diff --git a/ci/playbooks/edpm/update.yml b/ci/playbooks/edpm/update.yml index cc663f7ccc..c2e5e501cd 100644 --- a/ci/playbooks/edpm/update.yml +++ b/ci/playbooks/edpm/update.yml @@ -21,6 +21,7 @@ cmd: >- ansible-playbook update-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/edpm_ci.yml {%- if edpm_file.stat.exists %} diff --git a/ci/playbooks/edpm_baremetal_deployment/run.yml b/ci/playbooks/edpm_baremetal_deployment/run.yml index ed388ed081..a6e2902a78 100644 --- a/ci/playbooks/edpm_baremetal_deployment/run.yml +++ b/ci/playbooks/edpm_baremetal_deployment/run.yml @@ -59,6 +59,7 @@ cmd: >- ansible-playbook deploy-edpm.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/edpm_baremetal_deployment_ci.yml {%- if edpm_file.stat.exists %} diff --git a/ci/playbooks/edpm_build_images/edpm_build_images_content_provider_run.yaml b/ci/playbooks/edpm_build_images/edpm_build_images_content_provider_run.yaml index 0d6f2e62bb..df85fed949 100644 --- a/ci/playbooks/edpm_build_images/edpm_build_images_content_provider_run.yaml +++ b/ci/playbooks/edpm_build_images/edpm_build_images_content_provider_run.yaml @@ -18,6 +18,7 @@ cmd: >- ansible-playbook -i localhost, -c local ci/playbooks/edpm_build_images/edpm_build_images_content_provider.yaml + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml {%- if cifmw_extras is defined %} {%- for extra_vars in cifmw_extras %} diff --git a/ci/playbooks/edpm_build_images/run.yml b/ci/playbooks/edpm_build_images/run.yml index 2d1b0aef74..a526aca4f6 100644 --- a/ci/playbooks/edpm_build_images/run.yml +++ b/ci/playbooks/edpm_build_images/run.yml @@ -18,6 +18,7 @@ cmd: >- ansible-playbook -i {{ cifmw_zuul_target_host }}, -c local ci/playbooks/edpm_build_images/edpm_image_builder.yml + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml {%- if cifmw_extras is defined %} {%- for extra_vars in cifmw_extras %} diff --git a/ci/playbooks/kuttl/kuttl-from-operator-deps.yaml b/ci/playbooks/kuttl/kuttl-from-operator-deps.yaml index e34c79062e..a39300228d 100644 --- a/ci/playbooks/kuttl/kuttl-from-operator-deps.yaml +++ b/ci/playbooks/kuttl/kuttl-from-operator-deps.yaml @@ -8,6 +8,7 @@ cmd: >- ansible-playbook ci/playbooks/kuttl/deploy-deps.yaml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/ci.yml {%- if cifmw_extras is defined %} diff --git a/ci/playbooks/kuttl/kuttl-from-operator-run.yaml b/ci/playbooks/kuttl/kuttl-from-operator-run.yaml index dc5d376d87..f1dacb01bc 100644 --- a/ci/playbooks/kuttl/kuttl-from-operator-run.yaml +++ b/ci/playbooks/kuttl/kuttl-from-operator-run.yaml @@ -8,6 +8,7 @@ cmd: >- ansible-playbook ci/playbooks/kuttl/run-kuttl-from-operator-targets.yaml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/ci.yml {%- if cifmw_extras is defined %} diff --git a/ci/playbooks/kuttl/run.yml b/ci/playbooks/kuttl/run.yml index bc13b6ab56..8bc271e428 100644 --- a/ci/playbooks/kuttl/run.yml +++ b/ci/playbooks/kuttl/run.yml @@ -8,6 +8,7 @@ cmd: >- ansible-playbook ci/playbooks/kuttl/e2e-kuttl.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/ci.yml -e @scenarios/centos-9/kuttl.yml diff --git a/ci/playbooks/meta_content_provider/run.yml b/ci/playbooks/meta_content_provider/run.yml index 965a447c4b..71b44d2c3d 100644 --- a/ci/playbooks/meta_content_provider/run.yml +++ b/ci/playbooks/meta_content_provider/run.yml @@ -18,6 +18,7 @@ cmd: >- ansible-playbook ci/playbooks/meta_content_provider/meta_content_provider.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/meta_content_provider.yml -e "cifmw_rp_registry_ip={{ cifmw_rp_registry_ip }}" diff --git a/ci/playbooks/tcib/run.yml b/ci/playbooks/tcib/run.yml index 0d97f918a4..d4ddc6008f 100644 --- a/ci/playbooks/tcib/run.yml +++ b/ci/playbooks/tcib/run.yml @@ -23,6 +23,7 @@ cmd: >- ansible-playbook ci/playbooks/tcib/tcib.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml -e @scenarios/centos-9/base.yml -e @scenarios/centos-9/tcib.yml -e "cifmw_rp_registry_ip={{ node_ip }}" diff --git a/ci/playbooks/test-base-job/test-run.yml b/ci/playbooks/test-base-job/test-run.yml index a314546458..1deab468db 100644 --- a/ci/playbooks/test-base-job/test-run.yml +++ b/ci/playbooks/test-base-job/test-run.yml @@ -18,6 +18,7 @@ cmd: >- ansible-playbook ci/playbooks/test-base-job/nested-run.yml -i "{{ ansible_user_dir }}/ci-framework-data/artifacts/zuul_inventory.yml" + -e @group_vars/all.yml {%- if cifmw_extras is defined %} {%- for extra_var in cifmw_extras %} -e "{{ extra_var }}"