diff --git a/tests/playbooks/group_vars/all.yaml b/tests/playbooks/group_vars/all.yaml new file mode 100644 index 0000000..527d495 --- /dev/null +++ b/tests/playbooks/group_vars/all.yaml @@ -0,0 +1,2 @@ +--- +windmill_src_dir: "{{ zuul.projects['git.openstack.org/openstack/windmill'].src_dir }}" diff --git a/tests/playbooks/post.yaml b/tests/playbooks/post.yaml index 2c51be9..e810262 100644 --- a/tests/playbooks/post.yaml +++ b/tests/playbooks/post.yaml @@ -2,7 +2,7 @@ tasks: - name: Run ansible-playbook for collect-logs.yaml args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts tests/collect-logs.yaml - name: Ensure ara-report directory exists diff --git a/tests/playbooks/pre.yaml b/tests/playbooks/pre.yaml index 1c03918..38a40db 100644 --- a/tests/playbooks/pre.yaml +++ b/tests/playbooks/pre.yaml @@ -2,17 +2,17 @@ tasks: - name: Bootstrap tox environment args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" command: tox -evenv --notest - name: Install bindep dependendies args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" executable: /bin/bash shell: source .tox/venv/bin/activate; ./tools/install_bindep.sh - name: Install ansible roles via galaxy args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" executable: /bin/bash shell: source .tox/venv/bin/activate; ./tools/install_roles.sh diff --git a/tests/playbooks/run.yaml b/tests/playbooks/run.yaml index 24547ac..62bc8f7 100644 --- a/tests/playbooks/run.yaml +++ b/tests/playbooks/run.yaml @@ -2,15 +2,15 @@ tasks: - name: Bootstrap bastion node using ansible args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/bastion.yaml - name: Run ansible-playbook for site.yaml args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml --extra-vars "@tests/extra-vars.yaml" - name: Run ansible-playbook for prove.yaml args: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ windmill_src_dir }}" shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/prove.yaml