diff --git a/shippable.yml b/shippable.yml index 5fea2885..d5fe602d 100644 --- a/shippable.yml +++ b/shippable.yml @@ -18,7 +18,7 @@ matrix: - env: T=devel/units/3.9/1 - env: T=devel/osx/10.11/1 - - env: T=devel/rhel/7.6/1 + - env: T=devel/rhel/7.8/1 - env: T=devel/rhel/8.1/1 - env: T=devel/freebsd/11.1/1 - env: T=devel/freebsd/12.1/1 @@ -39,7 +39,7 @@ matrix: - env: T=2.9/sanity/1 - env: T=2.9/units/2.7/1 - env: T=2.9/units/3.8/1 - - env: T=2.9/rhel/7.6/1 + - env: T=2.9/rhel/7.8/1 - env: T=2.9/linux/ubuntu1804/1 - env: T=2.9/cloud/3.6/1 diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 9fab40b2..2e974712 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -2,15 +2,6 @@ plugins/module_utils/compat/ipaddress.py future-import-boilerplate plugins/module_utils/compat/ipaddress.py metaclass-boilerplate plugins/module_utils/compat/ipaddress.py no-assert plugins/module_utils/compat/ipaddress.py no-unicode-literals -plugins/modules/acme_certificate.py validate-modules:return-syntax-error -plugins/modules/certificate_complete_chain.py validate-modules:return-syntax-error -plugins/modules/get_certificate.py validate-modules:return-syntax-error -plugins/modules/openssh_cert.py validate-modules:return-syntax-error -plugins/modules/openssl_csr.py validate-modules:return-syntax-error -plugins/modules/openssl_csr_info.py validate-modules:return-syntax-error -plugins/modules/x509_certificate_info.py validate-modules:return-syntax-error -plugins/modules/x509_crl.py validate-modules:return-syntax-error -plugins/modules/x509_crl_info.py validate-modules:return-syntax-error tests/unit/mock/path.py future-import-boilerplate tests/unit/mock/path.py metaclass-boilerplate tests/unit/mock/yaml_helper.py future-import-boilerplate diff --git a/tests/sanity/requirements.txt b/tests/sanity/requirements.txt deleted file mode 100644 index 3e3a9669..00000000 --- a/tests/sanity/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -packaging # needed for update-bundled and changelog -sphinx ; python_version >= '3.5' # docs build requires python 3+ -sphinx-notfound-page ; python_version >= '3.5' # docs build requires python 3+ -straight.plugin ; python_version >= '3.5' # needed for hacking/build-ansible.py which will host changelog generation and requires python 3+ diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 5e1c4a98..7b75a490 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -55,7 +55,8 @@ 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 - retry pip install ansible==${ansible_version} --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 fi