From 06383b276890dbec03605a30aee34c58778bc9b0 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 7 Feb 2019 16:02:25 +0800 Subject: [PATCH] tests: update Dockerfile to support fc-29 and s/yum/dnf/ Signed-off-by: Kefu Chai --- src/test/{fedora-21 => fedora-29}/Dockerfile.in | 4 ++-- src/test/{fedora-21 => fedora-29}/ceph.spec.in | 0 src/test/{fedora-21 => fedora-29}/install-deps.sh | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/test/{fedora-21 => fedora-29}/Dockerfile.in (89%) rename src/test/{fedora-21 => fedora-29}/ceph.spec.in (100%) rename src/test/{fedora-21 => fedora-29}/install-deps.sh (100%) diff --git a/src/test/fedora-21/Dockerfile.in b/src/test/fedora-29/Dockerfile.in similarity index 89% rename from src/test/fedora-21/Dockerfile.in rename to src/test/fedora-29/Dockerfile.in index 8c64a052944..fbb88d86628 100644 --- a/src/test/fedora-21/Dockerfile.in +++ b/src/test/fedora-29/Dockerfile.in @@ -22,8 +22,8 @@ FROM fedora:%%os_version%% COPY install-deps.sh /root/ COPY ceph.spec.in /root/ # build dependencies -RUN yum install -y which ; cd /root ; ./install-deps.sh +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 yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted 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-21/ceph.spec.in b/src/test/fedora-29/ceph.spec.in similarity index 100% rename from src/test/fedora-21/ceph.spec.in rename to src/test/fedora-29/ceph.spec.in diff --git a/src/test/fedora-21/install-deps.sh b/src/test/fedora-29/install-deps.sh similarity index 100% rename from src/test/fedora-21/install-deps.sh rename to src/test/fedora-29/install-deps.sh -- 2.39.5