From 45d8819b7c5eaee656688e8330e692ec6a3d22c4 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 9 Jan 2024 07:25:45 +0100 Subject: [PATCH 1/2] Remove Shippable leftovers. --- tests/utils/shippable/shippable.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 1cff6d8..6269f57 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -62,16 +62,7 @@ else retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi -if [ "${SHIPPABLE_BUILD_ID:-}" ]; then - export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible" - SHIPPABLE_RESULT_DIR="$(pwd)/shippable" - TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/ansible/posix" - mkdir -p "${TEST_DIR}" - cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}" - cd "${TEST_DIR}" -else - export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../" -fi +export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../" # START: HACK install dependencies if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then From 8e900e5218ddece901624dc223b8a2b4c0081fb1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 9 Jan 2024 07:30:04 +0100 Subject: [PATCH 2/2] Support for FreeBSD 12.4 was removed. --- .azure-pipelines/azure-pipelines.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 0d81188..498e5f8 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -211,8 +211,6 @@ stages: test: rhel/9.1 - name: FreeBSD 13.2 test: freebsd/13.2 - - name: FreeBSD 12.4 - test: freebsd/12.4 - stage: Remote_2_14 displayName: Remote 2.14 dependsOn: [] @@ -227,8 +225,6 @@ stages: test: rhel/8.6 - name: FreeBSD 13.2 test: freebsd/13.2 - - name: FreeBSD 12.4 - test: freebsd/12.4 ## Finally