From f38a97cece7eb28ee93dac9ff4d734f657b7a9c4 Mon Sep 17 00:00:00 2001
From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com>
Date: Wed, 1 Sep 2021 12:36:09 -0400
Subject: [PATCH] Fix build_ignore when installing a collection from source
 (#75547)

* Make individual dirs that should exist instead of using shutil.copytree

* Test build_ignore when installing collections in git repos

* changelog

* Fix assertion
Fix git directory

* Fix nested content while building the collection dir

Test installing a collection from a git repo and artifact have the same result

Refactor to use variables
---
 ...ix-installing-collections-from-source.yaml |  2 +
 lib/ansible/galaxy/collection/__init__.py     |  7 +--
 .../tasks/empty_installed_collections.yml     |  8 +--
 .../tasks/individual_collection_repo.yml      |  6 +-
 .../tasks/main.yml                            |  7 ++-
 .../tasks/multi_collection_repo_all.yml       | 33 ++++++++++-
 .../multi_collection_repo_individual.yml      |  2 +-
 .../tasks/reinstalling.yml                    |  6 +-
 .../tasks/requirements.yml                    |  4 +-
 .../tasks/scm_dependency.yml                  |  4 +-
 .../tasks/scm_dependency_deduplication.yml    | 20 +++----
 .../tasks/setup.yml                           |  4 +-
 .../tasks/setup_multi_collection_repo.yml     | 55 +++++++++++++++++--
 .../tasks/setup_recursive_scm_dependency.yml  | 14 ++---
 .../templates/git_prefix_name.yml             |  2 +-
 .../templates/name_and_type.yml               |  2 +-
 .../templates/name_without_type.yml           |  2 +-
 .../templates/source_and_name.yml             |  2 +-
 .../templates/source_and_name_and_type.yml    |  2 +-
 .../templates/source_only.yml                 |  2 +-
 .../vars/main.yml                             |  4 ++
 21 files changed, 132 insertions(+), 56 deletions(-)
 create mode 100644 changelogs/fragments/75547-fix-installing-collections-from-source.yaml
 create mode 100644 test/integration/targets/ansible-galaxy-collection-scm/vars/main.yml

diff --git a/changelogs/fragments/75547-fix-installing-collections-from-source.yaml b/changelogs/fragments/75547-fix-installing-collections-from-source.yaml
new file mode 100644
index 00000000000..67baec252af
--- /dev/null
+++ b/changelogs/fragments/75547-fix-installing-collections-from-source.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - ansible-galaxy - Fix a bug with build_ignore when installing collections from source (https://github.com/ansible/ansible/issues/75528).
diff --git a/lib/ansible/galaxy/collection/__init__.py b/lib/ansible/galaxy/collection/__init__.py
index 3a38dba32c5..9e3454e6b4f 100644
--- a/lib/ansible/galaxy/collection/__init__.py
+++ b/lib/ansible/galaxy/collection/__init__.py
@@ -994,23 +994,20 @@ def _build_collection_dir(b_collection_path, b_collection_output, collection_man
         os.chmod(b_path, 0o0644)
 
     base_directories = []
-    for file_info in file_manifest['files']:
+    for file_info in sorted(file_manifest['files'], key=lambda x: x['name']):
         if file_info['name'] == '.':
             continue
 
         src_file = os.path.join(b_collection_path, to_bytes(file_info['name'], errors='surrogate_or_strict'))
         dest_file = os.path.join(b_collection_output, to_bytes(file_info['name'], errors='surrogate_or_strict'))
 
-        if any(src_file.startswith(directory) for directory in base_directories):
-            continue
-
         existing_is_exec = os.stat(src_file).st_mode & stat.S_IXUSR
         mode = 0o0755 if existing_is_exec else 0o0644
 
         if os.path.isdir(src_file):
             mode = 0o0755
             base_directories.append(src_file)
-            shutil.copytree(src_file, dest_file)
+            os.mkdir(dest_file, mode)
         else:
             shutil.copyfile(src_file, dest_file)
 
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/empty_installed_collections.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/empty_installed_collections.yml
index f21a6f6ba41..241107c3a87 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/empty_installed_collections.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/empty_installed_collections.yml
@@ -1,7 +1,7 @@
 - name: delete installed collections
   file:
-    state: "{{ item }}"
-    path: "{{ galaxy_dir }}/ansible_collections"
+    state: absent
+    path: "{{ item }}"
   loop:
-    - absent
-    - directory
+    - "{{ install_path }}"
+    - "{{ alt_install_path }}"
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/individual_collection_repo.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/individual_collection_repo.yml
index 1b761f60767..9ca7c8f0de4 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/individual_collection_repo.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/individual_collection_repo.yml
@@ -1,12 +1,10 @@
 - name: Clone a git repository
   git:
     repo: https://github.com/ansible-collections/amazon.aws.git
-    dest: '{{ galaxy_dir }}/development/amazon.aws/'
+    dest: '{{ scm_path }}/amazon.aws/'
 
 - name: install
-  command: 'ansible-galaxy collection install git+file://{{galaxy_dir }}/development/amazon.aws/.git'
-  args:
-    chdir: '{{ galaxy_dir }}/development'
+  command: 'ansible-galaxy collection install git+file://{{ scm_path }}/amazon.aws/.git'
 
 - name: list installed collections
   command: 'ansible-galaxy collection list'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/main.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/main.yml
index 7a98a6ed848..759226d2370 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/main.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: Test installing collections from git repositories
   environment:
-    ANSIBLE_COLLECTIONS_PATHS: '{{ galaxy_dir }}'
+    ANSIBLE_COLLECTIONS_PATHS: "{{ galaxy_dir }}/collections"
   vars:
     cleanup: True
     galaxy_dir: "{{ galaxy_dir }}"
@@ -32,8 +32,9 @@
       path: '{{ item }}'
       state: absent
     loop:
-      - '{{ galaxy_dir }}/ansible_collections'
-      - '{{ galaxy_dir }}/development'
+      - "{{ install_path }}"
+      - "{{ alt_install_path }}"
+      - "{{ scm_path }}"
 
   - name: remove git
     package:
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_all.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_all.yml
index 2992062a98b..f22f98447d8 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_all.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_all.yml
@@ -1,5 +1,5 @@
 - name: Install all collections by default
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git'
 
 - name: list installed collections
   command: 'ansible-galaxy collection list'
@@ -10,5 +10,36 @@
       - "'ansible_test.collection_1' in installed_collections.stdout"
       - "'ansible_test.collection_2' in installed_collections.stdout"
 
+- name: install from artifact to another path to compare contents
+  command: 'ansible-galaxy collection install {{ artifact_path }} -p {{ alt_install_path }} --no-deps'
+  vars:
+    artifact_path: "{{ galaxy_dir }}/ansible_test-collection_1-1.0.0.tar.gz"
+
+- name: check if the files and folders in build_ignore were respected
+  stat:
+    path: "{{ install_path }}/ansible_test/collection_1/{{ item }}"
+  register: result
+  loop:
+    - foo.txt
+    - foobar/baz.txt
+    - foobar/qux
+
+- assert:
+    that: result.results | map(attribute='stat') | map(attribute='exists') is not any
+
+- name: check that directory with ignored files exists and is empty
+  stat:
+    path: "{{ install_path }}/ansible_test/collection_1/foobar"
+  register: result
+
+- assert:
+    that: result.stat.exists
+
+- name: test that there are no diff installing from a repo vs artifact
+  command: "diff -ur {{ collection_from_artifact }} {{ collection_from_repo }} -x *.json"
+  vars:
+    collection_from_repo: "{{ install_path }}/ansible_test/collection_1"
+    collection_from_artifact: "{{ alt_install_path }}/ansible_test/collection_1"
+
 - include_tasks: ./empty_installed_collections.yml
   when: cleanup
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_individual.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_individual.yml
index 48f6407a9c9..a5a2bdfc9d6 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_individual.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/multi_collection_repo_individual.yml
@@ -1,5 +1,5 @@
 - name: test installing one collection
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#collection_2'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#collection_2'
 
 - name: list installed collections
   command: 'ansible-galaxy collection list'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/reinstalling.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/reinstalling.yml
index 11654c7ee34..90a70e2fdb5 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/reinstalling.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/reinstalling.yml
@@ -1,5 +1,5 @@
 - name: Rerun installing a collection with a dep
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#/collection_1/'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#/collection_1/'
   register: installed
 
 - name: SCM collections don't have a concrete artifact version so the collection should always be reinstalled
@@ -9,7 +9,7 @@
       - "'Created collection for ansible_test.collection_2' in installed.stdout"
 
 - name: The collection should also be reinstalled when --force flag is used
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#/collection_1/ --force'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#/collection_1/ --force'
   register: installed
 
 - assert:
@@ -19,7 +19,7 @@
       - "'Created collection for ansible_test.collection_2' in installed.stdout"
 
 - name: The collection should also be reinstalled when --force-with-deps is used
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#/collection_1/ --force-with-deps'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#/collection_1/ --force-with-deps'
   register: installed
 
 - assert:
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/requirements.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/requirements.yml
index f71eb50c8ba..235ed12662d 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/requirements.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/requirements.yml
@@ -80,7 +80,7 @@
 - name: Clone a git repository
   git:
     repo: https://github.com/ansible-collections/amazon.aws.git
-    dest: '{{ galaxy_dir }}/development/amazon.aws/'
+    dest: '{{ scm_path }}/amazon.aws/'
 
 - name: test using name as a git repo
   command: 'ansible-galaxy collection install -r git_prefix_name.yml'
@@ -99,5 +99,5 @@
     path: '{{ item }}'
     state: absent
   loop:
-    - '{{ galaxy_dir }}/development/amazon.aws/'
+    - '{{ scm_path }}/amazon.aws/'
     - '{{ galaxy_dir }}/requirements'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency.yml
index 1668dac0fa0..5645aec6d0d 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency.yml
@@ -1,5 +1,5 @@
 - name: test installing one collection that has a SCM dep with --no-deps
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#/collection_1/ --no-deps'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#/collection_1/ --no-deps'
 
 - name: list installed collections
   command: 'ansible-galaxy collection list'
@@ -14,7 +14,7 @@
   include_tasks: ./empty_installed_collections.yml
 
 - name: test installing one collection that has a SCM dep
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/ansible_test/.git#/collection_1/'
+  command: 'ansible-galaxy collection install git+file://{{ test_repo_path }}/.git#/collection_1/'
 
 - name: list installed collections
   command: 'ansible-galaxy collection list'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency_deduplication.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency_deduplication.yml
index 6423836b164..f200be18032 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency_deduplication.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/scm_dependency_deduplication.yml
@@ -1,5 +1,5 @@
 - name: Install all collections in a repo, one of which has a recursive dependency
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/namespace_1/.git'
+  command: 'ansible-galaxy collection install git+file://{{ scm_path }}/namespace_1/.git'
   register: command
 
 - assert:
@@ -13,22 +13,22 @@
         in command.stdout_lines
       - >-
         "Installing 'namespace_1.collection_1:1.0.0' to
-        '{{ galaxy_dir }}/ansible_collections/namespace_1/collection_1'"
+        '{{ install_path }}/namespace_1/collection_1'"
         in command.stdout_lines
       - >-
         'Created collection for namespace_1.collection_1:1.0.0 at
-        {{ galaxy_dir }}/ansible_collections/namespace_1/collection_1'
+        {{ install_path }}/namespace_1/collection_1'
         in command.stdout_lines
       - >-
         'namespace_1.collection_1:1.0.0 was installed successfully'
         in command.stdout_lines
       - >-
         "Installing 'namespace_2.collection_2:1.0.0' to
-        '{{ galaxy_dir }}/ansible_collections/namespace_2/collection_2'"
+        '{{ install_path }}/namespace_2/collection_2'"
         in command.stdout_lines
       - >-
         'Created collection for namespace_2.collection_2:1.0.0 at
-        {{ galaxy_dir }}/ansible_collections/namespace_2/collection_2'
+        {{ install_path }}/namespace_2/collection_2'
         in command.stdout_lines
       - >-
         'namespace_2.collection_2:1.0.0 was installed successfully'
@@ -44,7 +44,7 @@
       - "'namespace_2.collection_2' in installed_collections.stdout"
 
 - name: Install a specific collection in a repo with a recursive dependency
-  command: 'ansible-galaxy collection install git+file://{{ galaxy_dir }}/development/namespace_1/.git#/collection_1/ --force-with-deps'
+  command: 'ansible-galaxy collection install git+file://{{ scm_path }}/namespace_1/.git#/collection_1/ --force-with-deps'
   register: command
 
 - assert:
@@ -58,22 +58,22 @@
         in command.stdout_lines
       - >-
         "Installing 'namespace_1.collection_1:1.0.0' to
-        '{{ galaxy_dir }}/ansible_collections/namespace_1/collection_1'"
+        '{{ install_path }}/namespace_1/collection_1'"
         in command.stdout_lines
       - >-
         'Created collection for namespace_1.collection_1:1.0.0 at
-        {{ galaxy_dir }}/ansible_collections/namespace_1/collection_1'
+        {{ install_path }}/namespace_1/collection_1'
         in command.stdout_lines
       - >-
         'namespace_1.collection_1:1.0.0 was installed successfully'
         in command.stdout_lines
       - >-
         "Installing 'namespace_2.collection_2:1.0.0' to
-        '{{ galaxy_dir }}/ansible_collections/namespace_2/collection_2'"
+        '{{ install_path }}/namespace_2/collection_2'"
         in command.stdout_lines
       - >-
         'Created collection for namespace_2.collection_2:1.0.0 at
-        {{ galaxy_dir }}/ansible_collections/namespace_2/collection_2'
+        {{ install_path }}/namespace_2/collection_2'
         in command.stdout_lines
       - >-
         'namespace_2.collection_2:1.0.0 was installed successfully'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup.yml
index b83d3e78e7a..bb882c9d796 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup.yml
@@ -15,5 +15,5 @@
     path: '{{ item }}'
     state: directory
   loop:
-    - '{{ galaxy_dir }}/ansible_collections'
-    - '{{ galaxy_dir }}/development/ansible_test'
+    - '{{ install_path }}'
+    - '{{ test_repo_path }}'
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_multi_collection_repo.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_multi_collection_repo.yml
index 4a662ca6234..e733a8459a4 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_multi_collection_repo.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_multi_collection_repo.yml
@@ -1,27 +1,70 @@
 - name: Initialize a git repo
-  command: 'git init {{ galaxy_dir }}/development/ansible_test'
+  command: 'git init {{ test_repo_path }}'
 
 - stat:
-    path: "{{ galaxy_dir }}/development/ansible_test"
+    path: "{{ test_repo_path }}"
 
 - name: Add a couple collections to the repository
   command: 'ansible-galaxy collection init {{ item }}'
   args:
-    chdir: '{{ galaxy_dir }}/development'
+    chdir: '{{ scm_path }}'
   loop:
     - 'ansible_test.collection_1'
     - 'ansible_test.collection_2'
 
+- name: Preserve the (empty) docs directory for the SCM collection
+  file:
+    path: '{{ test_repo_path }}/{{ item }}/docs/README.md'
+    state: touch
+  loop:
+    - collection_1
+    - collection_2
+
+- name: Preserve the (empty) roles directory for the SCM collection
+  file:
+    path: '{{ test_repo_path }}/{{ item }}/roles/README.md'
+    state: touch
+  loop:
+    - collection_1
+    - collection_2
+
+- name: create extra files and folders to test build_ignore
+  file:
+    path: '{{ test_repo_path }}/collection_1/{{ item.name }}'
+    state: '{{ item.state }}'
+  loop:
+    - name: foo.txt
+      state: touch
+    - name: foobar
+      state: directory
+    - name: foobar/qux
+      state: directory
+    - name: foobar/qux/bar
+      state: touch
+    - name: foobar/baz.txt
+      state: touch
+
 - name: Add collection_2 as a dependency of collection_1
   lineinfile:
-    path: '{{ galaxy_dir }}/development/ansible_test/collection_1/galaxy.yml'
+    path: '{{ test_repo_path }}/collection_1/galaxy.yml'
     regexp: '^dependencies'
-    line: "dependencies: {'git+file://{{ galaxy_dir }}/development/ansible_test/.git#collection_2/': '*'}"
+    line: "dependencies: {'git+file://{{ test_repo_path }}/.git#collection_2/': '*'}"
+
+- name: Ignore a directory and files
+  lineinfile:
+    path: '{{ test_repo_path }}/collection_1/galaxy.yml'
+    regexp: '^build_ignore'
+    line: "build_ignore: ['foo.txt', 'foobar/*']"
 
 - name: Commit the changes
   command: '{{ item }}'
   args:
-    chdir: '{{ galaxy_dir }}/development/ansible_test'
+    chdir: '{{ test_repo_path }}'
   loop:
     - git add ./
     - git commit -m 'add collections'
+
+- name: Build the actual artifact for ansible_test.collection_1 for comparison
+  command: "ansible-galaxy collection build ansible_test/collection_1 --output-path {{ galaxy_dir }}"
+  args:
+    chdir: "{{ scm_path }}"
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_recursive_scm_dependency.yml b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_recursive_scm_dependency.yml
index df0af917cff..dd307d72a4a 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_recursive_scm_dependency.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/tasks/setup_recursive_scm_dependency.yml
@@ -1,5 +1,5 @@
 - name: Initialize git repositories
-  command: 'git init {{ galaxy_dir }}/development/{{ item }}'
+  command: 'git init {{ scm_path }}/{{ item }}'
   loop:
     - namespace_1
     - namespace_2
@@ -7,27 +7,27 @@
 - name: Add a couple collections to the repository
   command: 'ansible-galaxy collection init {{ item }}'
   args:
-    chdir: '{{ galaxy_dir }}/development'
+    chdir: '{{ scm_path }}'
   loop:
     - 'namespace_1.collection_1'
     - 'namespace_2.collection_2'
 
 - name: Add collection_2 as a dependency of collection_1
   lineinfile:
-    path: '{{ galaxy_dir }}/development/namespace_1/collection_1/galaxy.yml'
+    path: '{{ scm_path }}/namespace_1/collection_1/galaxy.yml'
     regexp: '^dependencies'
-    line: "dependencies: {'git+file://{{ galaxy_dir }}/development/namespace_2/.git#collection_2/': '*'}"
+    line: "dependencies: {'git+file://{{ scm_path }}/namespace_2/.git#collection_2/': '*'}"
 
 - name: Add collection_1 as a dependency on collection_2
   lineinfile:
-    path: '{{ galaxy_dir }}/development/namespace_2/collection_2/galaxy.yml'
+    path: '{{ scm_path }}/namespace_2/collection_2/galaxy.yml'
     regexp: '^dependencies'
-    line: "dependencies: {'git+file://{{ galaxy_dir }}/development/namespace_1/.git#collection_1/': 'master'}"
+    line: "dependencies: {'git+file://{{ scm_path }}/namespace_1/.git#collection_1/': 'master'}"
 
 - name: Commit the changes
   shell: git add ./; git commit -m 'add collection'
   args:
-    chdir: '{{ galaxy_dir }}/development/{{ item }}'
+    chdir: '{{ scm_path }}/{{ item }}'
   loop:
     - namespace_1
     - namespace_2
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/git_prefix_name.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/git_prefix_name.yml
index 97cef773e2e..8b0e78843c8 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/git_prefix_name.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/git_prefix_name.yml
@@ -1,2 +1,2 @@
 collections:
-  - name: git+file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - name: git+file://{{ scm_path }}/amazon.aws/.git
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/name_and_type.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/name_and_type.yml
index cf461b39ecd..8f6be4614fc 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/name_and_type.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/name_and_type.yml
@@ -1,3 +1,3 @@
 collections:
-  - name: file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - name: file://{{ scm_path }}/amazon.aws/.git
     type: git
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/name_without_type.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/name_without_type.yml
index ec8ad1096c2..9d340b5426d 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/name_without_type.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/name_without_type.yml
@@ -1,3 +1,3 @@
 collections:
   # should not work: git prefix or type is required
-  - name: file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - name: file://{{ scm_path }}/amazon.aws/.git
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name.yml
index 841ff24d3de..b7bdb277646 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name.yml
@@ -1,4 +1,4 @@
 collections:
   # should not work: source is expected to be a galaxy server name or URL
-  - source: git+file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - source: git+file://{{ scm_path }}/amazon.aws/.git
     name: ansible.nope
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name_and_type.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name_and_type.yml
index 89eb9ea5e6f..01a2ea2cd1f 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name_and_type.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_and_name_and_type.yml
@@ -1,5 +1,5 @@
 collections:
   # should not work: source is expected to be a galaxy server name or URL
-  - source: git+file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - source: git+file://{{ scm_path }}/amazon.aws/.git
     name: ansible.nope
     type: git
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_only.yml b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_only.yml
index 2ad6cc634fa..74f87085d54 100644
--- a/test/integration/targets/ansible-galaxy-collection-scm/templates/source_only.yml
+++ b/test/integration/targets/ansible-galaxy-collection-scm/templates/source_only.yml
@@ -1,3 +1,3 @@
 collections:
   # should not work: source is expected to be a galaxy server name or URL
-  - source: git+file://{{ galaxy_dir }}/development/amazon.aws/.git
+  - source: git+file://{{ scm_path }}/amazon.aws/.git
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/vars/main.yml b/test/integration/targets/ansible-galaxy-collection-scm/vars/main.yml
new file mode 100644
index 00000000000..c8f50afdf39
--- /dev/null
+++ b/test/integration/targets/ansible-galaxy-collection-scm/vars/main.yml
@@ -0,0 +1,4 @@
+install_path: "{{ galaxy_dir }}/collections/ansible_collections"
+alt_install_path: "{{ galaxy_dir }}/other_collections/ansible_collections"
+scm_path: "{{ galaxy_dir }}/development"
+test_repo_path: "{{ galaxy_dir }}/development/ansible_test"