From: Kefu Chai <kchai@redhat.com>
Date: Wed, 19 Feb 2020 07:40:54 +0000 (+0800)
Subject: test/centos-8: change to adapt to centos8
X-Git-Tag: v15.1.1~336^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=425a00a15657476f303367b000b14aaa27fa5a73;p=ceph-ci.git

test/centos-8: change to adapt to centos8

for more context, see

https://github.com/CentOS/sig-cloud-instance-images/issues/22
https://wiki.centos.org/AdditionalResources/Repositories/CR
https://fedoraproject.org/wiki/EPEL

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/centos-8/Dockerfile.in b/src/test/centos-8/Dockerfile.in
index 0e06cfa6c72..0eaec6e6a0f 100644
--- a/src/test/centos-8/Dockerfile.in
+++ b/src/test/centos-8/Dockerfile.in
@@ -22,12 +22,10 @@ FROM centos:%%os_version%%
 
 COPY install-deps.sh /root/
 COPY ceph.spec.in /root/
-# http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/
-RUN yum -y swap -- remove fakesystemd systemd-libs systemd-container -- install systemd systemd-libs && (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done) && rm -f /lib/systemd/system/multi-user.target.wants/* && rm -f /etc/systemd/system/*.wants/* && rm -f /lib/systemd/system/local-fs.target.wants/* && rm -f /lib/systemd/system/sockets.target.wants/*udev* && rm -f /lib/systemd/system/sockets.target.wants/*initctl* && rm -f /lib/systemd/system/basic.target.wants/* && rm -f /lib/systemd/system/anaconda.target.wants/* && yum install -y redhat-lsb-core
-RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && yum install --nogpgcheck -y epel-release && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && rm /etc/yum.repos.d/dl.fedoraproject.org* && yum-config-manager --enable cr
+RUN dnf install -y redhat-lsb-core
+RUN dnf install -y yum-utils && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 && dnf update -y && dnf config-manager --enable cr
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-# nc is required to run make check on firefly only (giant+ do not use nc)
-RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
+RUN dnf install -y git sudo
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi