From 884c5bb037ac507871134c80e802d5e942a4a695 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 19 Mar 2020 11:21:48 +0800
Subject: [PATCH] tests: update Dockerfile to support fc-31

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/test/{fedora-29 => fedora-31}/Dockerfile.in   | 5 +----
 src/test/{fedora-29 => fedora-31}/ceph.spec.in    | 0
 src/test/{fedora-29 => fedora-31}/install-deps.sh | 0
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename src/test/{fedora-29 => fedora-31}/Dockerfile.in (78%)
 rename src/test/{fedora-29 => fedora-31}/ceph.spec.in (100%)
 rename src/test/{fedora-29 => fedora-31}/install-deps.sh (100%)

diff --git a/src/test/fedora-29/Dockerfile.in b/src/test/fedora-31/Dockerfile.in
similarity index 78%
rename from src/test/fedora-29/Dockerfile.in
rename to src/test/fedora-31/Dockerfile.in
index fbb88d866281a..3598271f6ae9e 100644
--- a/src/test/fedora-29/Dockerfile.in
+++ b/src/test/fedora-31/Dockerfile.in
@@ -22,8 +22,5 @@ FROM fedora:%%os_version%%
 COPY install-deps.sh /root/
 COPY ceph.spec.in /root/
 # build dependencies
-RUN dnf install -y which ; cd /root ; ./install-deps.sh
-# development tools
-# nc is required to run make check on firefly only (giant+ do not use nc)
-RUN dnf install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
+RUN dnf install -y which gdb git sudo; cd /root ; ./install-deps.sh
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi
diff --git a/src/test/fedora-29/ceph.spec.in b/src/test/fedora-31/ceph.spec.in
similarity index 100%
rename from src/test/fedora-29/ceph.spec.in
rename to src/test/fedora-31/ceph.spec.in
diff --git a/src/test/fedora-29/install-deps.sh b/src/test/fedora-31/install-deps.sh
similarity index 100%
rename from src/test/fedora-29/install-deps.sh
rename to src/test/fedora-31/install-deps.sh
-- 
2.39.5