Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ansible-test-location issue #1866

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion playbooks/ansible-test-base/run.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
- hosts: controller
vars:
ansible_test_location: "~/{{ zuul.projects[ansible_collections_repo].src_dir }}"
tasks:
- name: Copy the galaxy.yml on the controller
fetch:
Expand All @@ -25,6 +27,5 @@
name: ansible-test
vars:
ansible_test_test_command: "{{ ansible_test_command }}"
ansible_test_location: "~/{{ zuul.projects[ansible_collections_repo].src_dir }}"
ansible_test_git_branch: "{{ zuul.projects['github.com/ansible/ansible'].checkout }}"
ansible_test_ansible_path: "~/{{ zuul.projects['github.com/ansible/ansible'].src_dir }}"
2 changes: 1 addition & 1 deletion roles/ansible-test/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ansible_test_test_command: 'integration'
ansible_test_continue_on_error: true
ansible_test_retry_on_error: false
ansible_test_skip_tags: false
ansible_test_location: "{{ ~/ansible-test | expanduser }}"
ansible_test_location: "{{ '~/ansible-test' | expanduser }}"
ansible_test_docker: false
# Default ansible-test options
ansible_test_git_branch: 'devel'
Expand Down