From c7b2bbf550a9a02fda09e26362150129f3bb9588 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 10 Aug 2018 11:47:13 +0200
Subject: base/centos: stop treating AArch64 in special way

All repositories we depend on got synced to mirrors. So we no longer
need to fetch ceph-luminous or opstools from buildlogs.centos.org
server.

Change-Id: Ie7b54d20f98d26d3e086bbbfcda289c2677a008a
---
 docker/base/Dockerfile.j2    | 23 +++++------------------
 docker/base/aarch64-cbs.repo | 11 -----------
 2 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 docker/base/aarch64-cbs.repo

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cb389afe3..ac503e804 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -66,12 +66,7 @@ RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
 {% set base_yum_repo_keys = [
 ] %}
 
-{% if base_arch == 'aarch64' %}
-    {% set base_yum_repo_files = [
-        'aarch64-cbs.repo'
-    ] %}
-
-{% elif base_arch == 'x86_64' %}
+{% if base_arch == 'x86_64' %}
     {% set base_yum_repo_files = [
         'elasticsearch.repo',
         'grafana.repo',
@@ -128,27 +123,19 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 {% endblock %}
 
 {% set base_centos_yum_repo_keys = [
+    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
+    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
 ] %}
 
 {% set base_centos_yum_repo_packages = [
+    'centos-release-ceph-luminous',
+    'centos-release-opstools',
     'centos-release-qemu-ev',
     'epel-release',
     'yum-plugin-priorities'
 ] %}
 
-{% if base_arch == 'x86_64' %}
-    {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage'
-    ] %}
-
-    {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
-        'centos-release-ceph-luminous',
-        'centos-release-opstools'
-    ] %}
-{% endif %}
-
 {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }}
 {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %}
     {%- if loop.first %}RUN {% else %}    && {% endif -%}
diff --git a/docker/base/aarch64-cbs.repo b/docker/base/aarch64-cbs.repo
deleted file mode 100644
index 6986b886f..000000000
--- a/docker/base/aarch64-cbs.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-[aarch64-opstools]
-name=CentOS opstools repo
-baseurl=https://buildlogs.centos.org/centos/7/opstools/aarch64
-enabled=1
-gpgcheck=0
-
-[aarch64-ceph-luminous]
-name=CentOS Storage SIG repo with Ceph Luminous
-baseurl=https://buildlogs.centos.org/centos/7/storage/aarch64/ceph-luminous/
-enabled=1
-gpgcheck=0
-- 
cgit v1.2.3