fix up some of the import from community.general artifacts

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2020-06-19 10:19:46 -05:00
parent 82daf8ba9f
commit 11bd762953
2 changed files with 31 additions and 39 deletions

View file

@ -8,36 +8,36 @@ matrix:
exclude:
- env: T=none
include:
- env: T=stable-2.9/aix/7.2/1
- env: T=stable-2.9/osx/10.11/1
- env: T=stable-2.9/rhel/7.6/1
- env: T=stable-2.9/rhel/8.1/1
- env: T=stable-2.9/freebsd/11.1/1
- env: T=stable-2.9/freebsd/12.1/1
- env: T=stable-2.9/linux/centos6/1
- env: T=stable-2.9/linux/centos7/1
- env: T=stable-2.9/linux/centos8/1
- env: T=stable-2.9/linux/fedora30/1
- env: T=stable-2.9/linux/fedora31/1
- env: T=stable-2.9/linux/opensuse15py2/1
- env: T=stable-2.9/linux/opensuse15/1
- env: T=stable-2.9/linux/ubuntu1604/1
- env: T=stable-2.9/linux/ubuntu1804/1
- env: T=stable-2.10/aix/7.2/1
- env: T=stable-2.10/osx/10.11/1
- env: T=stable-2.10/rhel/7.6/1
- env: T=stable-2.10/rhel/8.1/1
- env: T=stable-2.10/freebsd/11.1/1
- env: T=stable-2.10/freebsd/12.1/1
- env: T=stable-2.10/linux/centos6/1
- env: T=stable-2.10/linux/centos7/1
- env: T=stable-2.10/linux/centos8/1
- env: T=stable-2.10/linux/fedora30/1
- env: T=stable-2.10/linux/fedora31/1
- env: T=stable-2.10/linux/opensuse15py2/1
- env: T=stable-2.10/linux/opensuse15/1
- env: T=stable-2.10/linux/ubuntu1604/1
- env: T=stable-2.10/linux/ubuntu1804/1
- env: T=2.9/aix/7.2/1
- env: T=2.9/osx/10.11/1
- env: T=2.9/rhel/7.6/1
- env: T=2.9/rhel/8.1/1
- env: T=2.9/freebsd/11.1/1
- env: T=2.9/freebsd/12.1/1
- env: T=2.9/linux/centos6/1
- env: T=2.9/linux/centos7/1
- env: T=2.9/linux/centos8/1
- env: T=2.9/linux/fedora30/1
- env: T=2.9/linux/fedora31/1
- env: T=2.9/linux/opensuse15py2/1
- env: T=2.9/linux/opensuse15/1
- env: T=2.9/linux/ubuntu1604/1
- env: T=2.9/linux/ubuntu1804/1
- env: T=2.10/aix/7.2/1
- env: T=2.10/osx/10.11/1
- env: T=2.10/rhel/7.6/1
- env: T=2.10/rhel/8.1/1
- env: T=2.10/freebsd/11.1/1
- env: T=2.10/freebsd/12.1/1
- env: T=2.10/linux/centos6/1
- env: T=2.10/linux/centos7/1
- env: T=2.10/linux/centos8/1
- env: T=2.10/linux/fedora30/1
- env: T=2.10/linux/fedora31/1
- env: T=2.10/linux/opensuse15py2/1
- env: T=2.10/linux/opensuse15/1
- env: T=2.10/linux/ubuntu1604/1
- env: T=2.10/linux/ubuntu1804/1
- env: T=devel/aix/7.2/1
- env: T=devel/osx/10.11/1
- env: T=devel/rhel/7.6/1

View file

@ -61,20 +61,12 @@ fi
export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/ansible/posix"
mkdir -p "${TEST_DIR}"
cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
cd "${TEST_DIR}"
# START: HACK install dependencies
retry ansible-galaxy -vvv collection install ansible.netcommon
retry ansible-galaxy -vvv collection install ansible.posix
retry ansible-galaxy -vvv collection install community.crypto
# retry ansible-galaxy -vvv collection install community.internal_test_tools - we need git checkout until 0.2.0 has been released
retry git clone https://github.com/ansible-collections/community.internal_test_tools.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/internal_test_tools"
retry ansible-galaxy -vvv collection install community.kubernetes
retry ansible-galaxy -vvv collection install google.cloud
# END: HACK
export PYTHONIOENCODING='utf-8'