Have pip grab the latest patch version for us

johanmeiring · Jan 18, 2020 · 48b497c · 48b497c
1 parent 68cc73c
commit 48b497c
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,42 +2,42 @@
 sudo: required
 
 env:
-  - ansible: 2.5.15.0
+  - ansible: 2.5
     distribution: ubuntu
     version: 16.04
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.9.2.0
+  - ansible: 2.9
     distribution: ubuntu
     version: 16.04
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.5.15.0
+  - ansible: 2.5
     distribution: ubuntu
     version: 18.04
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.9.2.0
+  - ansible: 2.9
     distribution: ubuntu
     version: 18.04
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.5.15.0
+  - ansible: 2.5
     distribution: centos
     version: 7
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.9.2.0
+  - ansible: 2.9
     distribution: centos
     version: 7
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.5.15.0
+  - ansible: 2.5
     distribution: centos
     version: 8
     init: /sbin/init
     run_opts: ""
-  - ansible: 2.9.2.0
+  - ansible: 2.9
     distribution: centos
     version: 8
     init: /sbin/init

diff --git a/run-local-tests.sh b/run-local-tests.sh
@@ -21,14 +21,14 @@ run_test() {
   docker stop "$(cat ${container_id})"
 }
 
-run_test ubuntu 16.04 2.5.15.0
-run_test ubuntu 16.04 2.9.2.0
+run_test ubuntu 16.04 2.5
+run_test ubuntu 16.04 2.9
 
-run_test ubuntu 18.04 2.5.15.0
-run_test ubuntu 18.04 2.9.2.0
+run_test ubuntu 18.04 2.5
+run_test ubuntu 18.04 2.9
 
-run_test centos 7 2.5.15.0
-run_test centos 7 2.9.2.0
+run_test centos 7 2.5
+run_test centos 7 2.9
 
-run_test centos 8 2.5.15.0
-run_test centos 8 2.9.2.0
+run_test centos 8 2.5
+run_test centos 8 2.9
diff --git a/tests/Dockerfile.centos-7.ansible-2.9.2.0 → tests/Dockerfile.centos-7.ansible-2.5 b/tests/Dockerfile.centos-7.ansible-2.9.2.0 → tests/Dockerfile.centos-7.ansible-2.5
@@ -8,7 +8,7 @@ RUN yum install -y openssh-server epel-release libffi-devel gcc
 RUN yum install -y python3-pip python3-devel openssl-devel
 #software-properties-common git  python-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.9.2.0'
+RUN pip3 install 'ansible~=2.5.0'
 RUN alternatives --install /usr/bin/python python /usr/bin/python3 60
 
 # Install Ansible inventory file

diff --git a/tests/Dockerfile.centos-7.ansible-2.5.15.0 → tests/Dockerfile.centos-7.ansible-2.9 b/tests/Dockerfile.centos-7.ansible-2.5.15.0 → tests/Dockerfile.centos-7.ansible-2.9
@@ -8,7 +8,7 @@ RUN yum install -y openssh-server epel-release libffi-devel gcc
 RUN yum install -y python3-pip python3-devel openssl-devel
 #software-properties-common git  python-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.5.15.0'
+RUN pip3 install 'ansible~=2.9.0'
 RUN alternatives --install /usr/bin/python python /usr/bin/python3 60
 
 # Install Ansible inventory file

diff --git a/tests/Dockerfile.centos-8.ansible-2.9.2.0 → tests/Dockerfile.centos-8.ansible-2.5 b/tests/Dockerfile.centos-8.ansible-2.9.2.0 → tests/Dockerfile.centos-8.ansible-2.5
@@ -8,7 +8,7 @@ RUN yum install -y openssh-server epel-release libffi-devel gcc
 RUN yum install -y python3-pip python3-devel openssl-devel
 #software-properties-common git  python-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.9.2.0'
+RUN pip3 install 'ansible~=2.5.0'
 RUN alternatives --set python /usr/bin/python3
 
 # Install Ansible inventory file

diff --git a/tests/Dockerfile.centos-8.ansible-2.5.15.0 → tests/Dockerfile.centos-8.ansible-2.9 b/tests/Dockerfile.centos-8.ansible-2.5.15.0 → tests/Dockerfile.centos-8.ansible-2.9
@@ -8,7 +8,7 @@ RUN yum install -y openssh-server epel-release libffi-devel gcc
 RUN yum install -y python3-pip python3-devel openssl-devel
 #software-properties-common git  python-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.5.15.0'
+RUN pip3 install 'ansible~=2.9.0'
 RUN alternatives --set python /usr/bin/python3
 
 # Install Ansible inventory file

diff --git a/...s/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 → tests/Dockerfile.ubuntu-16.04.ansible-2.5 b/...s/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 → tests/Dockerfile.ubuntu-16.04.ansible-2.5
@@ -7,7 +7,7 @@ RUN apt-get install -y openssh-server
 # Install Ansible
 RUN apt-get install -y software-properties-common git python3-pip python3-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.9.2.0'
+RUN pip3 install 'ansible~=2.5.0'
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
 # Install Ansible inventory file

diff --git a/.../Dockerfile.ubuntu-16.04.ansible-2.5.15.0 → tests/Dockerfile.ubuntu-16.04.ansible-2.9 b/.../Dockerfile.ubuntu-16.04.ansible-2.5.15.0 → tests/Dockerfile.ubuntu-16.04.ansible-2.9
@@ -7,7 +7,7 @@ RUN apt-get install -y openssh-server
 # Install Ansible
 RUN apt-get install -y software-properties-common git python3-pip python3-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.5.15.0'
+RUN pip3 install 'ansible~=2.9.0'
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
 # Install Ansible inventory file

diff --git a/...s/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 → tests/Dockerfile.ubuntu-18.04.ansible-2.5 b/...s/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 → tests/Dockerfile.ubuntu-18.04.ansible-2.5
@@ -7,7 +7,7 @@ RUN apt-get install -y openssh-server
 # Install Ansible
 RUN apt-get install -y software-properties-common git python3-pip python3-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.9.2.0'
+RUN pip3 install 'ansible~=2.5.0'
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
 # Install Ansible inventory file

diff --git a/.../Dockerfile.ubuntu-18.04.ansible-2.5.15.0 → tests/Dockerfile.ubuntu-18.04.ansible-2.9 b/.../Dockerfile.ubuntu-18.04.ansible-2.5.15.0 → tests/Dockerfile.ubuntu-18.04.ansible-2.9
@@ -7,7 +7,7 @@ RUN apt-get install -y openssh-server
 # Install Ansible
 RUN apt-get install -y software-properties-common git python3-pip python3-dev libffi-dev libssl-dev
 RUN pip3 install -U setuptools
-RUN pip3 install 'ansible==2.5.15.0'
+RUN pip3 install 'ansible~=2.9.0'
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
 # Install Ansible inventory file