diff --git a/shippable.yml b/shippable.yml index f2daf2cf..4334b501 100644 --- a/shippable.yml +++ b/shippable.yml @@ -37,6 +37,14 @@ matrix: - env: T=devel/cloud/2.7/1 - env: T=devel/cloud/3.6/1 + # For Ansible 2.10, use a combination of different targets + - env: T=2.10/sanity/1 + - env: T=2.10/units/2.7/1 + - env: T=2.10/units/3.8/1 + - env: T=2.10/rhel/7.8/1 + - env: T=2.10/linux/ubuntu1804/1 + - env: T=2.10/cloud/3.6/1 + # For Ansible 2.9, use a combination of different targets - env: T=2.9/sanity/1 - env: T=2.9/units/2.7/1 diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index e5986acc..854fe1e0 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -55,12 +55,11 @@ pip --version pip list --disable-pip-version-check if [ "${ansible_version}" == "devel" ]; then retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check -else +elif [ "${ansible_version}" == "2.9" ]; then + # Needed until all relevant backports have been merged retry pip install https://github.com/felixfontein/ansible/archive/backport/2.9/ansible-test.tar.gz --disable-pip-version-check - # retry pip install https://github.com/ansible/ansible/archive/stable-2.9.tar.gz --disable-pip-version-check - # retry pip install ansible==${ansible_version} --disable-pip-version-check - # force complete CI run for Ansible 2.9: 2.9's ansible-test's change detection for collections is broken - # COMPLETE=yes -- should no longer necessary with the backports +else + retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi # START: HACK