From 63b6b8a9d35a22af9d9002a3aa67bc11afc11e58 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 10 Apr 2020 17:26:24 +0200 Subject: [PATCH] Update testing (#147) * Remove superfluous requirements file. * Update RHEL 7.6 to RHEL 7.8 in CI. * Fix docker install. * ci_complete --- shippable.yml | 10 +++++----- .../integration/targets/setup_docker/tasks/Debian.yml | 1 + .../integration/targets/setup_docker/tasks/Fedora.yml | 1 + .../targets/setup_docker/tasks/RedHat-7.yml | 4 +++- .../targets/setup_docker/tasks/RedHat-8.yml | 1 + tests/integration/targets/setup_docker/tasks/Suse.yml | 1 + tests/integration/targets/setup_docker/tasks/main.yml | 1 + tests/sanity/requirements.txt | 4 ---- 8 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 tests/sanity/requirements.txt diff --git a/shippable.yml b/shippable.yml index a78d7799ba..946d2243e7 100644 --- a/shippable.yml +++ b/shippable.yml @@ -23,7 +23,7 @@ matrix: - env: T=aix/7.2/1 - env: T=osx/10.11/1 - - env: T=rhel/7.6/1 + - env: T=rhel/7.8/1 - env: T=rhel/8.1/1 - env: T=freebsd/11.1/1 - env: T=freebsd/12.1/1 @@ -39,7 +39,7 @@ matrix: - env: T=aix/7.2/2 - env: T=osx/10.11/2 - - env: T=rhel/7.6/2 + - env: T=rhel/7.8/2 - env: T=rhel/8.1/2 - env: T=freebsd/11.1/2 - env: T=freebsd/12.1/2 @@ -55,7 +55,7 @@ matrix: - env: T=aix/7.2/3 - env: T=osx/10.11/3 - - env: T=rhel/7.6/3 + - env: T=rhel/7.8/3 - env: T=rhel/8.1/3 - env: T=freebsd/11.1/3 - env: T=freebsd/12.1/3 @@ -71,7 +71,7 @@ matrix: - env: T=aix/7.2/4 - env: T=osx/10.11/4 - - env: T=rhel/7.6/4 + - env: T=rhel/7.8/4 - env: T=rhel/8.1/4 - env: T=freebsd/11.1/4 - env: T=freebsd/12.1/4 @@ -87,7 +87,7 @@ matrix: - env: T=aix/7.2/5 - env: T=osx/10.11/5 - - env: T=rhel/7.6/5 + - env: T=rhel/7.8/5 - env: T=rhel/8.1/5 - env: T=freebsd/11.1/5 - env: T=freebsd/12.1/5 diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml index e1dd2bf7f2..af049693c2 100644 --- a/tests/integration/targets/setup_docker/tasks/Debian.yml +++ b/tests/integration/targets/setup_docker/tasks/Debian.yml @@ -1,3 +1,4 @@ +--- - name: Get OS version shell: uname -r register: os_version diff --git a/tests/integration/targets/setup_docker/tasks/Fedora.yml b/tests/integration/targets/setup_docker/tasks/Fedora.yml index 9f52e8f144..1c665c2a24 100644 --- a/tests/integration/targets/setup_docker/tasks/Fedora.yml +++ b/tests/integration/targets/setup_docker/tasks/Fedora.yml @@ -1,3 +1,4 @@ +--- - name: Add repository yum_repository: file: docker-ce diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-7.yml b/tests/integration/targets/setup_docker/tasks/RedHat-7.yml index cacc708dc8..0b4668f276 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-7.yml @@ -1,3 +1,4 @@ +--- # The RHEL extras repository must be enabled to provide the container-selinux package. # See: https://docs.docker.com/engine/installation/linux/docker-ee/rhel/#install-using-the-repository @@ -12,7 +13,8 @@ name: setup_epel - name: Enable extras repository for RHEL on AWS - command: yum-config-manager --enable rhui-REGION-rhel-server-extras + # RHEL 7.6 uses rhui-REGION-rhel-server-extras and RHEL 7.7+ use rhui-rhel-7-server-rhui-extras-rpms + command: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms args: warn: no diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-8.yml b/tests/integration/targets/setup_docker/tasks/RedHat-8.yml index 63bf2a42af..3209443f99 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-8.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-8.yml @@ -1,3 +1,4 @@ +--- # The RHEL extras repository must be enabled to provide the container-selinux package. # See: https://docs.docker.com/engine/installation/linux/docker-ee/rhel/#install-using-the-repository diff --git a/tests/integration/targets/setup_docker/tasks/Suse.yml b/tests/integration/targets/setup_docker/tasks/Suse.yml index 3b4446774a..f107506b72 100644 --- a/tests/integration/targets/setup_docker/tasks/Suse.yml +++ b/tests/integration/targets/setup_docker/tasks/Suse.yml @@ -1,3 +1,4 @@ +--- - name: Install docker 17 community.general.zypper: name: "{{ docker_packages }}" diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml index 359a6d4493..f5a8064705 100644 --- a/tests/integration/targets/setup_docker/tasks/main.yml +++ b/tests/integration/targets/setup_docker/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Setup Docker when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6'] block: diff --git a/tests/sanity/requirements.txt b/tests/sanity/requirements.txt deleted file mode 100644 index 3e3a96692b..0000000000 --- a/tests/sanity/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -packaging # needed for update-bundled and changelog -sphinx ; python_version >= '3.5' # docs build requires python 3+ -sphinx-notfound-page ; python_version >= '3.5' # docs build requires python 3+ -straight.plugin ; python_version >= '3.5' # needed for hacking/build-ansible.py which will host changelog generation and requires python 3+