From 7da269a1dc00a4f78522a73b261d979f97aed6ff Mon Sep 17 00:00:00 2001 From: Johan Meiring Date: Thu, 16 Jan 2020 10:50:37 +0200 Subject: [PATCH 1/3] Update OS and Ansible versions for tests that are run - Minimum Ubuntu version is now 16.04, with 16.04 and 18.04 being tested explicitly. - Minimum CentOS version is no 7, with 7 and 8 being tested explicitly. In all cases, the minimum Ansible version is now 2.5. All tests are conducted using Python 3.5+. --- .travis.yml | 42 ++++++++----------- run-local-tests.sh | 19 ++++----- ...0 => Dockerfile.centos-7.ansible-2.5.15.0} | 9 ++-- ....0 => Dockerfile.centos-7.ansible-2.9.2.0} | 9 ++-- ...0 => Dockerfile.centos-8.ansible-2.5.15.0} | 12 +++--- ....0 => Dockerfile.centos-8.ansible-2.9.2.0} | 12 +++--- tests/Dockerfile.ubuntu-14.04.ansible-2.0.2.0 | 13 ------ tests/Dockerfile.ubuntu-14.04.ansible-2.2.2.0 | 13 ------ tests/Dockerfile.ubuntu-14.04.ansible-2.3.0.0 | 13 ------ ... Dockerfile.ubuntu-16.04.ansible-2.5.15.0} | 7 ++-- ...> Dockerfile.ubuntu-16.04.ansible-2.9.2.0} | 7 ++-- .../Dockerfile.ubuntu-18.04.ansible-2.5.15.0 | 14 +++++++ ...> Dockerfile.ubuntu-18.04.ansible-2.9.2.0} | 7 ++-- 13 files changed, 75 insertions(+), 102 deletions(-) rename tests/{Dockerfile.centos-7.ansible-2.3.0.0 => Dockerfile.centos-7.ansible-2.5.15.0} (59%) rename tests/{Dockerfile.centos-7.ansible-2.2.2.0 => Dockerfile.centos-7.ansible-2.9.2.0} (59%) rename tests/{Dockerfile.centos-6.ansible-2.3.0.0 => Dockerfile.centos-8.ansible-2.5.15.0} (59%) rename tests/{Dockerfile.centos-6.ansible-2.2.2.0 => Dockerfile.centos-8.ansible-2.9.2.0} (59%) delete mode 100644 tests/Dockerfile.ubuntu-14.04.ansible-2.0.2.0 delete mode 100644 tests/Dockerfile.ubuntu-14.04.ansible-2.2.2.0 delete mode 100644 tests/Dockerfile.ubuntu-14.04.ansible-2.3.0.0 rename tests/{Dockerfile.ubuntu-16.04.ansible-2.2.2.0 => Dockerfile.ubuntu-16.04.ansible-2.5.15.0} (50%) rename tests/{Dockerfile.ubuntu-16.04.ansible-2.3.0.0 => Dockerfile.ubuntu-16.04.ansible-2.9.2.0} (50%) create mode 100644 tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 rename tests/{Dockerfile.ubuntu-18.04.ansible-2.5.0.0 => Dockerfile.ubuntu-18.04.ansible-2.9.2.0} (50%) diff --git a/.travis.yml b/.travis.yml index 020ad4a..bb5cd58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,49 +2,44 @@ sudo: required env: - - ansible: 2.0.2.0 + - ansible: 2.5.15.0 distribution: ubuntu - version: 14.04 - init: /sbin/init - run_opts: "" - - ansible: 2.2.2.0 - distribution: ubuntu - version: 14.04 + version: 16.04 init: /sbin/init run_opts: "" - - ansible: 2.2.2.0 + - ansible: 2.9.2.0 distribution: ubuntu version: 16.04 init: /sbin/init run_opts: "" - - ansible: 2.3.0.0 + - ansible: 2.5.15.0 distribution: ubuntu - version: 14.04 + version: 18.04 init: /sbin/init run_opts: "" - - ansible: 2.3.0.0 + - ansible: 2.9.2.0 distribution: ubuntu - version: 16.04 + version: 18.04 init: /sbin/init run_opts: "" - - ansible: 2.2.2.0 + - ansible: 2.5.15.0 distribution: centos - version: 6 + version: 7 init: /sbin/init run_opts: "" - - ansible: 2.3.0.0 + - ansible: 2.9.2.0 distribution: centos - version: 6 + version: 7 init: /sbin/init run_opts: "" - - ansible: 2.2.2.0 + - ansible: 2.5.15.0 distribution: centos - version: 7 + version: 8 init: /sbin/init run_opts: "" - - ansible: 2.3.0.0 + - ansible: 2.9.2.0 distribution: centos - version: 7 + version: 8 init: /sbin/init run_opts: "" @@ -53,9 +48,9 @@ services: before_install: # Pull container - - 'sudo docker pull ${distribution}:${version}' + - "sudo docker pull ${distribution}:${version}" # Customize container - - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version}.ansible-${ansible} --tag=${distribution}-${version}:ansible-${ansible} tests' + - "sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version}.ansible-${ansible} --tag=${distribution}-${version}:ansible-${ansible} tests" script: - container_id=$(mktemp) @@ -106,6 +101,5 @@ script: || (echo 'Idempotence test: fail' && exit 1) # Clean up - 'sudo docker stop "$(cat ${container_id})"' - # notifications: - # webhooks: https://galaxy.ansible.com/api/v1/notifications/ +# webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/run-local-tests.sh b/run-local-tests.sh index ae33af9..b77811f 100755 --- a/run-local-tests.sh +++ b/run-local-tests.sh @@ -7,6 +7,7 @@ run_test() { docker build --rm=true --file=tests/Dockerfile.$1-$2.ansible-$3 --tag=$1-$2:ansible-$3 tests container_id=$(mktemp) docker run --rm=true --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro $1-$2:ansible-$3 /sbin/init > "${container_id}" + docker exec --tty "$(cat ${container_id})" env TERM=xterm python --version docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml docker exec --tty "$(cat ${container_id})" env TERM=xterm grep "user1" /etc/shadow && (echo 'User created' && exit 0) || (echo 'User not created' && exit 1) @@ -20,16 +21,14 @@ run_test() { docker stop "$(cat ${container_id})" } -run_test ubuntu 14.04 2.2.2.0 -run_test ubuntu 14.04 2.3.0.0 +run_test ubuntu 16.04 2.5.15.0 +run_test ubuntu 16.04 2.9.2.0 -run_test ubuntu 16.04 2.2.2.0 -run_test ubuntu 16.04 2.3.0.0 +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.0.0 +run_test centos 7 2.5.15.0 +run_test centos 7 2.9.2.0 -run_test centos 6 2.2.2.0 -run_test centos 6 2.3.0.0 - -run_test centos 7 2.2.2.0 -run_test centos 7 2.3.0.0 +run_test centos 8 2.5.15.0 +run_test centos 8 2.9.2.0 diff --git a/tests/Dockerfile.centos-7.ansible-2.3.0.0 b/tests/Dockerfile.centos-7.ansible-2.5.15.0 similarity index 59% rename from tests/Dockerfile.centos-7.ansible-2.3.0.0 rename to tests/Dockerfile.centos-7.ansible-2.5.15.0 index 17f75ef..896b496 100644 --- a/tests/Dockerfile.centos-7.ansible-2.3.0.0 +++ b/tests/Dockerfile.centos-7.ansible-2.5.15.0 @@ -1,14 +1,15 @@ FROM centos:7 -#RUN yum update +RUN yum -y update # Install OpenSSH server RUN yum install -y openssh-server epel-release libffi-devel gcc # Install Ansible -RUN yum install -y python-pip python-devel openssl-devel +RUN yum install -y python3-pip python3-devel openssl-devel #software-properties-common git python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.3.0.0' +RUN pip3 install -U setuptools +RUN pip3 install 'ansible==2.5.15.0' +RUN alternatives --install /usr/bin/python python /usr/bin/python3 60 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "localhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.centos-7.ansible-2.2.2.0 b/tests/Dockerfile.centos-7.ansible-2.9.2.0 similarity index 59% rename from tests/Dockerfile.centos-7.ansible-2.2.2.0 rename to tests/Dockerfile.centos-7.ansible-2.9.2.0 index f0b5cee..2d3e6ce 100644 --- a/tests/Dockerfile.centos-7.ansible-2.2.2.0 +++ b/tests/Dockerfile.centos-7.ansible-2.9.2.0 @@ -1,14 +1,15 @@ FROM centos:7 -#RUN yum update +RUN yum -y update # Install OpenSSH server RUN yum install -y openssh-server epel-release libffi-devel gcc # Install Ansible -RUN yum install -y python-pip python-devel openssl-devel +RUN yum install -y python3-pip python3-devel openssl-devel #software-properties-common git python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.2.2.0' +RUN pip3 install -U setuptools +RUN pip3 install 'ansible==2.9.2.0' +RUN alternatives --install /usr/bin/python python /usr/bin/python3 60 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "localhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.centos-6.ansible-2.3.0.0 b/tests/Dockerfile.centos-8.ansible-2.5.15.0 similarity index 59% rename from tests/Dockerfile.centos-6.ansible-2.3.0.0 rename to tests/Dockerfile.centos-8.ansible-2.5.15.0 index 7cd5f4d..48ac11f 100644 --- a/tests/Dockerfile.centos-6.ansible-2.3.0.0 +++ b/tests/Dockerfile.centos-8.ansible-2.5.15.0 @@ -1,15 +1,15 @@ -FROM centos:6 -#RUN yum update +FROM centos:8 +RUN yum -y update # Install OpenSSH server RUN yum install -y openssh-server epel-release libffi-devel gcc # Install Ansible -RUN yum install -y python-pip python-devel openssl-devel +RUN yum install -y python3-pip python3-devel openssl-devel #software-properties-common git python-dev libffi-dev libssl-dev -RUN pip install --upgrade pip -RUN pip install -U setuptools -RUN pip install 'ansible==2.3.0.0' +RUN pip3 install -U setuptools +RUN pip3 install 'ansible==2.5.15.0' +RUN alternatives --set python /usr/bin/python3 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "localhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.centos-6.ansible-2.2.2.0 b/tests/Dockerfile.centos-8.ansible-2.9.2.0 similarity index 59% rename from tests/Dockerfile.centos-6.ansible-2.2.2.0 rename to tests/Dockerfile.centos-8.ansible-2.9.2.0 index a750a65..45628e2 100644 --- a/tests/Dockerfile.centos-6.ansible-2.2.2.0 +++ b/tests/Dockerfile.centos-8.ansible-2.9.2.0 @@ -1,15 +1,15 @@ -FROM centos:6 -#RUN yum update +FROM centos:8 +RUN yum -y update # Install OpenSSH server RUN yum install -y openssh-server epel-release libffi-devel gcc # Install Ansible -RUN yum install -y python-pip python-devel openssl-devel +RUN yum install -y python3-pip python3-devel openssl-devel #software-properties-common git python-dev libffi-dev libssl-dev -RUN pip install --upgrade pip -RUN pip install -U setuptools -RUN pip install 'ansible==2.2.2.0' +RUN pip3 install -U setuptools +RUN pip3 install 'ansible==2.9.2.0' +RUN alternatives --set python /usr/bin/python3 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "localhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-14.04.ansible-2.0.2.0 b/tests/Dockerfile.ubuntu-14.04.ansible-2.0.2.0 deleted file mode 100644 index cfecc8d..0000000 --- a/tests/Dockerfile.ubuntu-14.04.ansible-2.0.2.0 +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update - -# Install OpenSSH server -RUN apt-get install -y openssh-server - -# Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.0.2.0' - -# Install Ansible inventory file -RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-14.04.ansible-2.2.2.0 b/tests/Dockerfile.ubuntu-14.04.ansible-2.2.2.0 deleted file mode 100644 index cb88ba4..0000000 --- a/tests/Dockerfile.ubuntu-14.04.ansible-2.2.2.0 +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update - -# Install OpenSSH server -RUN apt-get install -y openssh-server - -# Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.2.2.0' - -# Install Ansible inventory file -RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-14.04.ansible-2.3.0.0 b/tests/Dockerfile.ubuntu-14.04.ansible-2.3.0.0 deleted file mode 100644 index 0d1bc1e..0000000 --- a/tests/Dockerfile.ubuntu-14.04.ansible-2.3.0.0 +++ /dev/null @@ -1,13 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update - -# Install OpenSSH server -RUN apt-get install -y openssh-server - -# Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.3.0.0' - -# Install Ansible inventory file -RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-16.04.ansible-2.2.2.0 b/tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 similarity index 50% rename from tests/Dockerfile.ubuntu-16.04.ansible-2.2.2.0 rename to tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 index 28afefc..31d50b2 100644 --- a/tests/Dockerfile.ubuntu-16.04.ansible-2.2.2.0 +++ b/tests/Dockerfile.ubuntu-16.04.ansible-2.5.15.0 @@ -5,9 +5,10 @@ RUN apt-get update RUN apt-get install -y openssh-server # Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.2.2.0' +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 update-alternatives --install /usr/bin/python python /usr/bin/python3 10 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-16.04.ansible-2.3.0.0 b/tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 similarity index 50% rename from tests/Dockerfile.ubuntu-16.04.ansible-2.3.0.0 rename to tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 index 8590b81..0c2107c 100644 --- a/tests/Dockerfile.ubuntu-16.04.ansible-2.3.0.0 +++ b/tests/Dockerfile.ubuntu-16.04.ansible-2.9.2.0 @@ -5,9 +5,10 @@ RUN apt-get update RUN apt-get install -y openssh-server # Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.3.0.0' +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 update-alternatives --install /usr/bin/python python /usr/bin/python3 10 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 b/tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 new file mode 100644 index 0000000..63c8fa6 --- /dev/null +++ b/tests/Dockerfile.ubuntu-18.04.ansible-2.5.15.0 @@ -0,0 +1,14 @@ +FROM ubuntu:18.04 +RUN apt-get update + +# Install OpenSSH server +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 update-alternatives --install /usr/bin/python python /usr/bin/python3 10 + +# Install Ansible inventory file +RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/Dockerfile.ubuntu-18.04.ansible-2.5.0.0 b/tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 similarity index 50% rename from tests/Dockerfile.ubuntu-18.04.ansible-2.5.0.0 rename to tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 index 61c623c..abed03b 100644 --- a/tests/Dockerfile.ubuntu-18.04.ansible-2.5.0.0 +++ b/tests/Dockerfile.ubuntu-18.04.ansible-2.9.2.0 @@ -5,9 +5,10 @@ RUN apt-get update RUN apt-get install -y openssh-server # Install Ansible -RUN apt-get install -y software-properties-common git python-pip python-dev libffi-dev libssl-dev -RUN pip install -U setuptools -RUN pip install 'ansible==2.5.0.0' +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 update-alternatives --install /usr/bin/python python /usr/bin/python3 10 # Install Ansible inventory file RUN mkdir /etc/ansible/ && echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts From 68cc73c064d5cf819c5d70678d4809c789a38dc4 Mon Sep 17 00:00:00 2001 From: Johan Meiring Date: Thu, 16 Jan 2020 10:52:15 +0200 Subject: [PATCH 2/3] Update role metadata - Minimum Ansible version is now 2.5. - Specify supported Ubuntu and CentOS versions. - Add more tags. --- meta/main.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index f498df7..1db3a36 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,15 +3,28 @@ galaxy_info: author: Johan Meiring description: "Setup chrooted SFTP service on top of OpenSSH" license: MIT - min_ansible_version: 2.0 + min_ansible_version: 2.5 platforms: - - name: Ubuntu - versions: - - all + - name: Ubuntu + versions: + - xenial + - yakkety + - zesty + - artful + - bionic + - cosmic + - disco + - eoan + - name: EL + versions: + - 7 + - 8 galaxy_tags: - networking - system + - sftp + - ssh dependencies: [] From 48b497c56cfe4af12e0407b91ce6435f0079e7d0 Mon Sep 17 00:00:00 2001 From: Johan Meiring Date: Sat, 18 Jan 2020 22:10:28 +0200 Subject: [PATCH 3/3] Have pip grab the latest patch version for us --- .travis.yml | 16 ++++++++-------- run-local-tests.sh | 16 ++++++++-------- ...e-2.9.2.0 => Dockerfile.centos-7.ansible-2.5} | 2 +- ...-2.5.15.0 => Dockerfile.centos-7.ansible-2.9} | 2 +- ...e-2.9.2.0 => Dockerfile.centos-8.ansible-2.5} | 2 +- ...-2.5.15.0 => Dockerfile.centos-8.ansible-2.9} | 2 +- ...9.2.0 => Dockerfile.ubuntu-16.04.ansible-2.5} | 2 +- ....15.0 => Dockerfile.ubuntu-16.04.ansible-2.9} | 2 +- ...9.2.0 => Dockerfile.ubuntu-18.04.ansible-2.5} | 2 +- ....15.0 => Dockerfile.ubuntu-18.04.ansible-2.9} | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) rename tests/{Dockerfile.centos-7.ansible-2.9.2.0 => Dockerfile.centos-7.ansible-2.5} (93%) rename tests/{Dockerfile.centos-7.ansible-2.5.15.0 => Dockerfile.centos-7.ansible-2.9} (92%) rename tests/{Dockerfile.centos-8.ansible-2.9.2.0 => Dockerfile.centos-8.ansible-2.5} (92%) rename tests/{Dockerfile.centos-8.ansible-2.5.15.0 => Dockerfile.centos-8.ansible-2.9} (92%) rename tests/{Dockerfile.ubuntu-16.04.ansible-2.9.2.0 => Dockerfile.ubuntu-16.04.ansible-2.5} (92%) rename tests/{Dockerfile.ubuntu-16.04.ansible-2.5.15.0 => Dockerfile.ubuntu-16.04.ansible-2.9} (92%) rename tests/{Dockerfile.ubuntu-18.04.ansible-2.9.2.0 => Dockerfile.ubuntu-18.04.ansible-2.5} (92%) rename tests/{Dockerfile.ubuntu-18.04.ansible-2.5.15.0 => Dockerfile.ubuntu-18.04.ansible-2.9} (92%) 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