From: Kefu Chai <kchai@redhat.com>
Date: Thu, 19 Mar 2020 03:21:48 +0000 (+0800)
Subject: tests: update Dockerfile to support fc-31
X-Git-Tag: v16.0.0~11^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=884c5bb037ac507871134c80e802d5e942a4a695;p=ceph.git

tests: update Dockerfile to support fc-31

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

diff --git a/src/test/fedora-29/Dockerfile.in b/src/test/fedora-29/Dockerfile.in
deleted file mode 100644
index fbb88d866281a..0000000000000
--- a/src/test/fedora-29/Dockerfile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2015 Red Hat <contact@redhat.com>
-#
-# Author: Loic Dachary <loic@dachary.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library Public License for more details.
-#
-# Environment variables are substituted via envsubst(1)
-#
-# user_id=$(id -u)
-# os_version= the desired REPOSITORY TAG
-#
-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 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-29/ceph.spec.in
deleted file mode 120000
index 9abcafd12dbb9..0000000000000
--- a/src/test/fedora-29/ceph.spec.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ceph.spec.in
\ No newline at end of file
diff --git a/src/test/fedora-29/install-deps.sh b/src/test/fedora-29/install-deps.sh
deleted file mode 120000
index fc9c78b27ff6f..0000000000000
--- a/src/test/fedora-29/install-deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../install-deps.sh
\ No newline at end of file
diff --git a/src/test/fedora-31/Dockerfile.in b/src/test/fedora-31/Dockerfile.in
new file mode 100644
index 0000000000000..3598271f6ae9e
--- /dev/null
+++ b/src/test/fedora-31/Dockerfile.in
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2015 Red Hat <contact@redhat.com>
+#
+# Author: Loic Dachary <loic@dachary.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library Public License for more details.
+#
+# Environment variables are substituted via envsubst(1)
+#
+# user_id=$(id -u)
+# os_version= the desired REPOSITORY TAG
+#
+FROM fedora:%%os_version%%
+COPY install-deps.sh /root/
+COPY ceph.spec.in /root/
+# build dependencies
+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-31/ceph.spec.in b/src/test/fedora-31/ceph.spec.in
new file mode 120000
index 0000000000000..9abcafd12dbb9
--- /dev/null
+++ b/src/test/fedora-31/ceph.spec.in
@@ -0,0 +1 @@
+../../../ceph.spec.in
\ No newline at end of file
diff --git a/src/test/fedora-31/install-deps.sh b/src/test/fedora-31/install-deps.sh
new file mode 120000
index 0000000000000..fc9c78b27ff6f
--- /dev/null
+++ b/src/test/fedora-31/install-deps.sh
@@ -0,0 +1 @@
+../../../install-deps.sh
\ No newline at end of file