From fa1269bca8e2683db42479d7c621314864f28957 Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Thu, 3 Sep 2020 21:44:08 -0700 Subject: [PATCH] see what happens with only ansible 2.10 tests, still need to install collections tho --- .ci/azure-pipelines.yml | 33 ++++++++---------------- .travis.yml | 57 ++++++++++++----------------------------- 2 files changed, 27 insertions(+), 63 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index ad4181c6..5c184120 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -3,6 +3,10 @@ # Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more: # https://docs.microsoft.com/azure/devops/pipelines/languages/python +# pointing to ansible 2.10 tag on github; ansible changed to ansible-base on pypi +# so to avoid complicating things for now, use git hash +# TODO: point to ansible==2.10 when it comes out so we don't need to install collections separately + jobs: - job: Mac @@ -18,7 +22,7 @@ jobs: Ans288_27: python.version: '2.7.18' MODE: localhost_ansible - VER: 2.8.8 + VER: git+https://github.com/ansible/ansible.git@v2.10.0 - job: Linux @@ -35,6 +39,7 @@ jobs: python.version: '2.7' MODE: mitogen DISTRO: debian + VER: git+https://github.com/ansible/ansible.git@v2.10.0 #MitoPy27CentOS6_26: #python.version: '2.7' @@ -45,17 +50,9 @@ jobs: python.version: '3.6' MODE: mitogen DISTRO: centos6 + VER: git+https://github.com/ansible/ansible.git@v2.10.0 Mito37Debian_27: - python.version: '3.7' - MODE: mitogen - DISTRO: debian - VER: 2.9.6 - - # pointing to ansible 2.10 tag on github; ansible changed to ansible-base on pypi - # so to avoid complicating things for now, use git hash - # TODO: handle this better - Mito37Ans~210Debian_27: python.version: '3.7' MODE: mitogen DISTRO: debian @@ -103,22 +100,12 @@ jobs: #DISTROS: debian #STRATEGY: linear - Ansible_280_27: + Ansible_210_27: python.version: '2.7' MODE: ansible - VER: 2.8.0 + VER: git+https://github.com/ansible/ansible.git@v2.10.0 - Ansible_280_35: + Ansible_210_35: python.version: '3.5' MODE: ansible - VER: 2.8.0 - - Ansible_296_37: - python.version: '3.7' - MODE: ansible - VER: 2.9.6 - - Ansible_210_37: - python.version: '3.7' - MODE: ansible VER: git+https://github.com/ansible/ansible.git@v2.10.0 diff --git a/.travis.yml b/.travis.yml index c0420a8c..6b8b953c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,72 +29,49 @@ script: # newest->oldest in various configuartions. matrix: - allow_failures: - # Python 2.4 tests are still unreliable - - language: c - env: MODE=mitogen_py24 DISTRO=centos5 - include: # Debops tests. - # 2.9.6; 3.6 -> 2.7 - - python: "3.6" - env: MODE=debops_common VER=2.9.6 - # ~2.10; 3.6 -> 2.7 + # 2.10; 3.6 -> 2.7 - python: "3.6" - env: MODE=debops_common VER: git+https://github.com/ansible/ansible.git@v2.10.0 - # 2.8.3; 3.6 -> 2.7 - - python: "3.6" - env: MODE=debops_common VER=2.8.3 - # 2.4.6.0; 2.7 -> 2.7 + env: MODE=debops_common VER=git+https://github.com/ansible/ansible.git@v2.10.0 + # 2.10; 2.7 -> 2.7 - python: "2.7" - env: MODE=debops_common VER=2.4.6.0 + env: MODE=debops_common VER=git+https://github.com/ansible/ansible.git@v2.10.0 # Sanity check against vanilla Ansible. One job suffices. - python: "2.7" - env: MODE=ansible VER=2.8.3 DISTROS=debian STRATEGY=linear + env: MODE=ansible VER=git+https://github.com/ansible/ansible.git@v2.10.0 DISTROS=debian STRATEGY=linear # ansible_mitogen tests. - # ~2.10 -> {debian, centos6, centos7} - - python: "3.6" - env: MODE=ansible VER: git+https://github.com/ansible/ansible.git@v2.10.0 - # 2.9.6 -> {debian, centos6, centos7} + # 2.10 -> {debian, centos6, centos7} - python: "3.6" - env: MODE=ansible VER=2.9.6 - # 2.8.3 -> {debian, centos6, centos7} - - python: "3.6" - env: MODE=ansible VER=2.8.3 - # 2.8.3 -> {debian, centos6, centos7} + env: MODE=ansible VER=git+https://github.com/ansible/ansible.git@v2.10.0 + # 2.10 -> {debian, centos6, centos7} - python: "2.7" - env: MODE=ansible VER=2.8.3 - - # 2.4.6.0 -> {debian, centos6, centos7} - - python: "3.6" - env: MODE=ansible VER=2.4.6.0 - # 2.4.6.0 -> {debian, centos6, centos7} + env: MODE=ansible VER=git+https://github.com/ansible/ansible.git@v2.10.0 + # 2.10 -> {debian, centos6, centos7} - python: "2.6" - env: MODE=ansible VER=2.4.6.0 + env: MODE=ansible VER=git+https://github.com/ansible/ansible.git@v2.10.0 - # 2.3 -> {centos5} + # 2.10 -> {centos5} - python: "2.6" - env: MODE=ansible VER=2.3.3.0 DISTROS=centos5 + env: MODE=ansible DISTROS=centos5 VER=git+https://github.com/ansible/ansible.git@v2.10.0 # Mitogen tests. # 2.4 -> 2.4 - language: c - env: MODE=mitogen_py24 DISTRO=centos5 + env: MODE=mitogen_py24 DISTROS=centos5 VER=git+https://github.com/ansible/ansible.git@v2.10.0 # 2.7 -> 2.7 -- moved to Azure # 2.7 -> 2.6 #- python: "2.7" #env: MODE=mitogen DISTRO=centos6 - python: "3.6" - env: MODE=mitogen DISTRO=centos7 VER: git+https://github.com/ansible/ansible.git@v2.10.0 - - python: "3.6" - env: MODE=mitogen DISTRO=centos7 + env: MODE=mitogen DISTROS=centos7 VER=git+https://github.com/ansible/ansible.git@v2.10.0 # 2.6 -> 2.7 - python: "2.6" - env: MODE=mitogen DISTRO=centos7 + env: MODE=mitogen DISTROS=centos7 VER=git+https://github.com/ansible/ansible.git@v2.10.0 # 2.6 -> 3.5 - python: "2.6" - env: MODE=mitogen DISTRO=debian-py3 + env: MODE=mitogen DISTROS=debian-py3 VER=git+https://github.com/ansible/ansible.git@v2.10.0 # 3.6 -> 2.6 -- moved to Azure