diff --git a/.travis.yml b/.travis.yml index bb5cd58..47e3b37 100644 --- 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 index b77811f..cddd5a8 100755 --- 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 b/tests/Dockerfile.centos-7.ansible-2.5 similarity index 93% rename from tests/Dockerfile.centos-7.ansible-2.9.2.0 rename to tests/Dockerfile.centos-7.ansible-2.5 index 2d3e6ce..4c26fa0 100644 --- a/tests/Dockerfile.centos-7.ansible-2.9.2.0 +++ b/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 b/tests/Dockerfile.centos-7.ansible-2.9 similarity index 92% rename from tests/Dockerfile.centos-7.ansible-2.5.15.0 rename to tests/Dockerfile.centos-7.ansible-2.9 index 896b496..4a90ac7 100644 --- a/tests/Dockerfile.centos-7.ansible-2.5.15.0 +++ b/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 b/tests/Dockerfile.centos-8.ansible-2.5 similarity index 92% rename from tests/Dockerfile.centos-8.ansible-2.9.2.0 rename to tests/Dockerfile.centos-8.ansible-2.5 index 45628e2..c27dd6d 100644 --- a/tests/Dockerfile.centos-8.ansible-2.9.2.0 +++ b/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 b/tests/Dockerfile.centos-8.ansible-2.9 similarity index 92% rename from tests/Dockerfile.centos-8.ansible-2.5.15.0 rename to tests/Dockerfile.centos-8.ansible-2.9 index 48ac11f..8ab5dc9 100644 --- a/tests/Dockerfile.centos-8.ansible-2.5.15.0 +++ b/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/tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 b/tests/Dockerfile.ubuntu-16.04.ansible-2.5 similarity index 92% rename from tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 rename to tests/Dockerfile.ubuntu-16.04.ansible-2.5 index 0c2107c..018cda4 100644 --- a/tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 +++ b/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/tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 b/tests/Dockerfile.ubuntu-16.04.ansible-2.9 similarity index 92% rename from tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 rename to tests/Dockerfile.ubuntu-16.04.ansible-2.9 index 31d50b2..afcac5a 100644 --- a/tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 +++ b/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/tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 b/tests/Dockerfile.ubuntu-18.04.ansible-2.5 similarity index 92% rename from tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 rename to tests/Dockerfile.ubuntu-18.04.ansible-2.5 index abed03b..6ec9697 100644 --- a/tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 +++ b/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/tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 b/tests/Dockerfile.ubuntu-18.04.ansible-2.9 similarity index 92% rename from tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 rename to tests/Dockerfile.ubuntu-18.04.ansible-2.9 index 63c8fa6..808a8da 100644 --- a/tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 +++ b/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