From cc8febb8415bea0cc5d35f9f0ed1aaefbe89ed2f Mon Sep 17 00:00:00 2001 From: Steven Robertson Date: Sat, 15 Aug 2020 23:39:37 -0700 Subject: [PATCH] use new released 2.10 --- .ci/azure-pipelines.yml | 8 +++++--- .travis.yml | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index c37c5910..ad4181c6 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -52,12 +52,14 @@ jobs: DISTRO: debian VER: 2.9.6 - # pointing to https://github.com/ansible/ansible/pull/67684 in prep for collections + Ansible 2.10 + # 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 - VER: git+https://github.com/nitzmahone/ansible.git@a7d0db69142134c2e36a0a62b81a32d9442792ef + VER: git+https://github.com/ansible/ansible.git@v2.10.0 #Py26CentOS7: #python.version: '2.7' @@ -119,4 +121,4 @@ jobs: Ansible_210_37: python.version: '3.7' MODE: ansible - VER: git+https://github.com/nitzmahone/ansible.git@a7d0db69142134c2e36a0a62b81a32d9442792ef + VER: git+https://github.com/ansible/ansible.git@v2.10.0 diff --git a/.travis.yml b/.travis.yml index 15919681..c0420a8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ matrix: env: MODE=debops_common VER=2.9.6 # ~2.10; 3.6 -> 2.7 - python: "3.6" - env: MODE=debops_common VER=git+https://github.com/nitzmahone/ansible.git@a7d0db69142134c2e36a0a62b81a32d9442792ef + 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 @@ -57,7 +57,7 @@ matrix: # ~2.10 -> {debian, centos6, centos7} - python: "3.6" - env: MODE=ansible VER=git+https://github.com/nitzmahone/ansible.git@a7d0db69142134c2e36a0a62b81a32d9442792ef + env: MODE=ansible VER: git+https://github.com/ansible/ansible.git@v2.10.0 # 2.9.6 -> {debian, centos6, centos7} - python: "3.6" env: MODE=ansible VER=2.9.6 @@ -88,7 +88,7 @@ matrix: #- python: "2.7" #env: MODE=mitogen DISTRO=centos6 - python: "3.6" - env: MODE=mitogen DISTRO=centos7 VER=git+https://github.com/nitzmahone/ansible.git@a7d0db69142134c2e36a0a62b81a32d9442792ef + env: MODE=mitogen DISTRO=centos7 VER: git+https://github.com/ansible/ansible.git@v2.10.0 - python: "3.6" env: MODE=mitogen DISTRO=centos7 # 2.6 -> 2.7