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
This commit is contained in:
parent
5b73ed78ba
commit
c7b2bbf550
|
@ -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 -%}
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue