From bfcb96573fb88e2b04e10931ea3e624af2bf2f2d Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
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
---
 tests/integration/targets/setup_docker/tasks/Debian.yml   | 1 +
 tests/integration/targets/setup_docker/tasks/Fedora.yml   | 1 +
 tests/integration/targets/setup_docker/tasks/RedHat-7.yml | 4 +++-
 tests/integration/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 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml
index e1dd2bf7..af049693 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 9f52e8f1..1c665c2a 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 cacc708d..0b4668f2 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 63bf2a42..3209443f 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 3b444677..f107506b 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 359a6d44..f5a80647 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: