Merge "Fix Oraclelinux build, disable collectd in gate"

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 \

tests/playbooks/post.yml

@@ -1,7 +1,5 @@
 ---
 - hosts: all
-  roles:
-    - collect-collectd
   tasks:
     - shell:
         cmd: |

tests/playbooks/pre.yml

@@ -1,8 +1,6 @@
 ---
 - hosts: all
   become: true
-  roles:
-    - collectd
   tasks:
     - name: Install dbus for debian system
       apt: name=dbus