From 65296e27e665a431b786944224195ba7593473bc Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Tue, 4 Dec 2018 10:10:51 +0100
Subject: [PATCH] Fix Oraclelinux build, disable collectd in gate

Oraclelinux repositories has been upgraded and
previous file removed, this change update repos
to new URLs.


Disable collectd in gate as is currently broken and
blocks mergingin voting jobs.

Change-Id: I402cff1ac86a2ba108f2f5378cc98db5f6ecc673
---
 docker/base/Dockerfile.j2 | 18 ++++++++++++++----
 tests/playbooks/post.yml  |  2 --
 tests/playbooks/pre.yml   |  2 --
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 52617b88b7..3780757324 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -42,7 +42,17 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
 
 {% block base_yum_conf %}
 
+{% if base_distro in ['oraclelinux'] %}
+{% set centos_contentdir = 'centos' %}
+
+{% if base_arch in ['aarch64', 'ppc64le'] %}
+    {% set centos_contentdir = 'altarch' %}
+{% endif %}
+{% endif %}
+
 COPY yum.conf /etc/yum.conf
+RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
+
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT
@@ -176,11 +186,11 @@ RUN yum -y install \
         yum-utils \
         https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     && rpm -Uvh --nodeps \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-luminous-1.0-1.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-7.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-2.el7.noarch.rpm \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-luminous-1.1-2.el7.centos.noarch.rpm \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-8.el7.noarch.rpm \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \
-        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-1-2.el7.centos.noarch.rpm \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-2-2.el7.centos.noarch.rpm \
     && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools \
diff --git a/tests/playbooks/post.yml b/tests/playbooks/post.yml
index f344396faa..bb514821d8 100644
--- a/tests/playbooks/post.yml
+++ b/tests/playbooks/post.yml
@@ -1,7 +1,5 @@
 ---
 - hosts: all
-  roles:
-    - collect-collectd
   tasks:
     - shell:
         cmd: |
diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index b368ebda00..00d471614c 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -1,8 +1,6 @@
 ---
 - hosts: all
   become: true
-  roles:
-    - collectd
   tasks:
     - name: Install dbus for debian system
       apt: name=dbus