ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-03-30 00:33:58 +00:00
Code Packages Projects Releases Wiki Activity

Adjust to new shellcheck in ansible-core devel's sanity tests. (#741) (#742)

Browse Source 
(cherry picked from commit 5256f94342)
This commit is contained in:
Felix Fontein 2024-01-04 22:43:38 +01:00 committed by GitHub
parent 5e96be6c39
commit e501ed2c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/targets/connection_nsenter/runme.sh
View File

@ -5,6 +5,7 @@ set -euo pipefail
[[ -n "${DEBUG:-}" || -n "${ANSIBLE_DEBUG:-}" ]] && set -x [[ -n "${DEBUG:-}" || -n "${ANSIBLE_DEBUG:-}" ]] && set -x
readonly IMAGE="quay.io/ansible/ansible-runner:devel" readonly IMAGE="quay.io/ansible/ansible-runner:devel"
# shellcheck disable=SC2155
readonly PYTHON="$(command -v python3 python | head -n1)" readonly PYTHON="$(command -v python3 python | head -n1)"
# Determine collection root # Determine collection root
@ -15,6 +16,7 @@ while true; do
fi fi
COLLECTION_ROOT="${COLLECTION_ROOT}../" COLLECTION_ROOT="${COLLECTION_ROOT}../"
done done
# shellcheck disable=SC2155
readonly COLLECTION_ROOT="$(cd ${COLLECTION_ROOT} ; pwd)" readonly COLLECTION_ROOT="$(cd ${COLLECTION_ROOT} ; pwd)"
# Setup phase # Setup phase

11
tests/utils/shippable/shippable.sh
View File

@ -62,16 +62,7 @@ else
retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
fi fi
if [ "${SHIPPABLE_BUILD_ID:-}" ]; then export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/docker"
mkdir -p "${TEST_DIR}"
cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
cd "${TEST_DIR}"
else
export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
fi
if [ "${test}" == "sanity/extra" ]; then if [ "${test}" == "sanity/extra" ]; then
retry pip install junit-xml --disable-pip-version-check retry pip install junit-xml --disable-pip-version-check