From 0a81e8408745f7bf8b0f09b22719b57fb9e85e1a Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 23 Jun 2026 19:21:37 +0200 Subject: [PATCH] Improve AZP nox scripts. (#1289) --- tests/utils/shippable/nox-prepare.sh | 6 ++++++ tests/utils/shippable/nox.sh | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/tests/utils/shippable/nox-prepare.sh b/tests/utils/shippable/nox-prepare.sh index 30041669..6d53e2ec 100755 --- a/tests/utils/shippable/nox-prepare.sh +++ b/tests/utils/shippable/nox-prepare.sh @@ -5,6 +5,10 @@ set -o pipefail -eux +# Fix for https://github.com/ansible-community/antsibull-nox/issues/222#issuecomment-4778928615 +# caused by https://github.com/ansible/azure-pipelines-test-container/blob/7714d81f64f268bbb10779e1265d312128607b76/Containerfile#L4 +export PATH="${PATH//:~\//:${HOME}/}" + nox_session="$1" docker images ansible/ansible @@ -47,6 +51,8 @@ export FORCE_COLOR=1 export ANTSIBULL_NOX_IGNORE_INSTALLED_COLLECTIONS="true" if [ "${nox_session}" == "extra-sanity-tests" ]; then + # We need the ansible-galaxy CLI tool to install collection dependencies + retry pip install ansible-core --disable-pip-version-check nox --verbose --install-only else nox --verbose --install-only -e "${nox_session}" diff --git a/tests/utils/shippable/nox.sh b/tests/utils/shippable/nox.sh index 27a0effa..b8f7174c 100755 --- a/tests/utils/shippable/nox.sh +++ b/tests/utils/shippable/nox.sh @@ -5,6 +5,10 @@ set -o pipefail -eux +# Fix for https://github.com/ansible-community/antsibull-nox/issues/222#issuecomment-4778928615 +# caused by https://github.com/ansible/azure-pipelines-test-container/blob/7714d81f64f268bbb10779e1265d312128607b76/Containerfile#L4 +export PATH="${PATH//:~\//:${HOME}/}" + nox_session="$1" export PYTHONIOENCODING='utf-8'