update ansible_test_location for ansible-test-base playbook

ansible · Jun 12, 2024 · 685f6f4 · 685f6f4
1 parent 5a0ed02
commit 685f6f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/playbooks/ansible-test-base/run.yaml b/playbooks/ansible-test-base/run.yaml
@@ -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:
@@ -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 }}"
diff --git a/roles/ansible-test/defaults/main.yaml b/roles/ansible-test/defaults/main.yaml
@@ -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'