diff options
| author | James Cassell <code@james.cassell.me> | 2020-06-11 20:40:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 20:40:13 +0200 |
| commit | 47d14a33bd673e0c353eae31b18552b767893972 (patch) | |
| tree | c3a8a59e175f6139bebb77148379703d9facc8fd /test/integration/targets/ansible-galaxy/runme.sh | |
| parent | Use antsibull-changelog instead of packaged changelog generator (#69313) (diff) | |
| download | ansible-47d14a33bd673e0c353eae31b18552b767893972.tar.xz ansible-47d14a33bd673e0c353eae31b18552b767893972.zip | |
config: singular ANSIBLE_COLLECTIONS_PATH (#70007)
* config: singular ANSIBLE_COLLECTIONS_PATH
Every other *_PATH setting in ansible is singular, and the traditional
$PATH variable is also singular despite containing a list of
directories. Let's be consistent both internally and with POSIX
tradition.
* update all ANSIBLE_COLLECTIONS_PATHS env references to be singular
* deprecate plural ANSIBLE_COLLECTIONS_PATHS setting
Diffstat (limited to 'test/integration/targets/ansible-galaxy/runme.sh')
| -rwxr-xr-x | test/integration/targets/ansible-galaxy/runme.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/targets/ansible-galaxy/runme.sh b/test/integration/targets/ansible-galaxy/runme.sh index b7978b4e68..2cd59825bf 100755 --- a/test/integration/targets/ansible-galaxy/runme.sh +++ b/test/integration/targets/ansible-galaxy/runme.sh @@ -205,7 +205,7 @@ popd # ${galaxy_testdir} # https://github.com/ansible/ansible/issues/60167#issuecomment-585460706 f_ansible_galaxy_status \ - "list specific role not in the first path in ANSIBLE_ROLES_PATHS" + "list specific role not in the first path in ANSIBLE_ROLES_PATH" role_testdir=$(mktemp -d) pushd "${role_testdir}" @@ -352,7 +352,7 @@ ansible-galaxy collection install ansible_test-zoo-2.5.0.tar.gz -p ./local ansible-galaxy collection init "ansible_test.development" mv ./ansible_test/development "${galaxy_testdir}/local/ansible_collections/ansible_test/" -export ANSIBLE_COLLECTIONS_PATHS=~/.ansible/collections:${galaxy_testdir}/local +export ANSIBLE_COLLECTIONS_PATH=~/.ansible/collections:${galaxy_testdir}/local f_ansible_galaxy_status \ "collection list all collections" @@ -413,7 +413,7 @@ f_ansible_galaxy_status \ rmdir emptydir -unset ANSIBLE_COLLECTIONS_PATHS +unset ANSIBLE_COLLECTIONS_PATH ## end ansible-galaxy collection list |