Install EPEL on RHEL using RPM from S3.

pva · Apr 5, 2019 · dd09a9a · dd09a9a
1 parent e9d1dd5
commit dd09a9a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/test/integration/targets/setup_docker/aliases b/test/integration/targets/setup_docker/aliases
@@ -0,0 +1 @@
+needs/target/setup_epel
diff --git a/test/integration/targets/setup_docker/tasks/RedHat.yml b/test/integration/targets/setup_docker/tasks/RedHat.yml
@@ -12,8 +12,8 @@
     - libseccomp
 
 - name: Install epel repo which is missing on rhel-7 and is needed for pigz (needed for docker-ce 18)
-  yum:
-    name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+  include_role:
+    name: setup_epel
 
 - name: Enable extras repository for RHEL on AWS
   command: yum-config-manager --enable rhui-REGION-rhel-server-extras

diff --git a/test/integration/targets/setup_epel/tasks/main.yml b/test/integration/targets/setup_epel/tasks/main.yml
@@ -0,0 +1,3 @@
+- name: Install EPEL
+  yum:
+    name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
diff --git a/test/integration/targets/setup_rpm_repo/aliases b/test/integration/targets/setup_rpm_repo/aliases
@@ -0,0 +1 @@
+needs/target/setup_epel
diff --git a/test/integration/targets/setup_rpm_repo/tasks/main.yml b/test/integration/targets/setup_rpm_repo/tasks/main.yml
@@ -1,7 +1,7 @@
 - block:
   - name: Install epel repo which is missing on rhel-7 and is needed for rpmfluff
-    package:
-      name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+    include_role:
+      name: setup_epel
     when:
       - ansible_distribution in ['RedHat']
       - ansible_distribution_major_version is version('7', '==')

diff --git a/test/integration/targets/ufw/aliases b/test/integration/targets/ufw/aliases
@@ -5,3 +5,4 @@ skip/rhel8.0
 skip/docker
 needs/root
 destructive
+needs/target/setup_epel
diff --git a/test/integration/targets/ufw/tasks/main.yml b/test/integration/targets/ufw/tasks/main.yml
@@ -1,9 +1,8 @@
 ---
 # Make sure ufw is installed
 - name: Install EPEL repository (RHEL only)
-  yum:
-    name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
-    state: present
+  include_role:
+    name: setup_epel
   when: ansible_distribution == 'RedHat'
 - name: Install iptables (SuSE only)
   package: