From 005cd1063d3edf1a0be3ab55c3b3dce8e824201d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 29 Aug 2021 21:43:23 +0800 Subject: [PATCH] test/docker-test.sh: add support for fedora 34 and debian strech and drop fedora-31, fedora32, debian-jessie and ubuntu-16.04 since they are not maintained anymore. see - https://fedoraproject.org/wiki/End_of_life - https://wiki.debian.org/LTS - https://wiki.ubuntu.com/Releases Signed-off-by: Kefu Chai --- .../Dockerfile.in | 0 .../{debian-jessie => debian-strech}/debian | 0 .../install-deps.sh | 0 src/test/fedora-32 | 1 - src/test/fedora-33 | 1 - .../{fedora-31 => fedora-33}/Dockerfile.in | 0 .../{fedora-31 => fedora-33}/ceph.spec.in | 0 .../{fedora-31 => fedora-33}/install-deps.sh | 0 src/test/fedora-34 | 1 + src/test/ubuntu-16.04/Dockerfile.in | 31 ------------------- src/test/ubuntu-16.04/debian | 1 - src/test/ubuntu-16.04/install-deps.sh | 1 - 12 files changed, 1 insertion(+), 35 deletions(-) rename src/test/{debian-jessie => debian-strech}/Dockerfile.in (100%) rename src/test/{debian-jessie => debian-strech}/debian (100%) rename src/test/{debian-jessie => debian-strech}/install-deps.sh (100%) delete mode 120000 src/test/fedora-32 delete mode 120000 src/test/fedora-33 rename src/test/{fedora-31 => fedora-33}/Dockerfile.in (100%) rename src/test/{fedora-31 => fedora-33}/ceph.spec.in (100%) rename src/test/{fedora-31 => fedora-33}/install-deps.sh (100%) create mode 120000 src/test/fedora-34 delete mode 100644 src/test/ubuntu-16.04/Dockerfile.in delete mode 120000 src/test/ubuntu-16.04/debian delete mode 120000 src/test/ubuntu-16.04/install-deps.sh diff --git a/src/test/debian-jessie/Dockerfile.in b/src/test/debian-strech/Dockerfile.in similarity index 100% rename from src/test/debian-jessie/Dockerfile.in rename to src/test/debian-strech/Dockerfile.in diff --git a/src/test/debian-jessie/debian b/src/test/debian-strech/debian similarity index 100% rename from src/test/debian-jessie/debian rename to src/test/debian-strech/debian diff --git a/src/test/debian-jessie/install-deps.sh b/src/test/debian-strech/install-deps.sh similarity index 100% rename from src/test/debian-jessie/install-deps.sh rename to src/test/debian-strech/install-deps.sh diff --git a/src/test/fedora-32 b/src/test/fedora-32 deleted file mode 120000 index d389c4ca9238..000000000000 --- a/src/test/fedora-32 +++ /dev/null @@ -1 +0,0 @@ -fedora-31 \ No newline at end of file diff --git a/src/test/fedora-33 b/src/test/fedora-33 deleted file mode 120000 index d389c4ca9238..000000000000 --- a/src/test/fedora-33 +++ /dev/null @@ -1 +0,0 @@ -fedora-31 \ No newline at end of file diff --git a/src/test/fedora-31/Dockerfile.in b/src/test/fedora-33/Dockerfile.in similarity index 100% rename from src/test/fedora-31/Dockerfile.in rename to src/test/fedora-33/Dockerfile.in diff --git a/src/test/fedora-31/ceph.spec.in b/src/test/fedora-33/ceph.spec.in similarity index 100% rename from src/test/fedora-31/ceph.spec.in rename to src/test/fedora-33/ceph.spec.in diff --git a/src/test/fedora-31/install-deps.sh b/src/test/fedora-33/install-deps.sh similarity index 100% rename from src/test/fedora-31/install-deps.sh rename to src/test/fedora-33/install-deps.sh diff --git a/src/test/fedora-34 b/src/test/fedora-34 new file mode 120000 index 000000000000..b2efdfaff9c9 --- /dev/null +++ b/src/test/fedora-34 @@ -0,0 +1 @@ +fedora-33 \ No newline at end of file diff --git a/src/test/ubuntu-16.04/Dockerfile.in b/src/test/ubuntu-16.04/Dockerfile.in deleted file mode 100644 index 1f006663967e..000000000000 --- a/src/test/ubuntu-16.04/Dockerfile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2016 Red Hat -# -# Author: Loic Dachary -# -# 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 ubuntu:%%os_version%% - -COPY install-deps.sh /root/ -RUN mkdir /root/debian -COPY debian /root/debian/ -RUN apt-get update -# build dependencies -RUN cd /root ; ./install-deps.sh -# development tools -RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet sudo -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/ubuntu-16.04/debian b/src/test/ubuntu-16.04/debian deleted file mode 120000 index dfdd39e6b2ba..000000000000 --- a/src/test/ubuntu-16.04/debian +++ /dev/null @@ -1 +0,0 @@ -../../../debian \ No newline at end of file diff --git a/src/test/ubuntu-16.04/install-deps.sh b/src/test/ubuntu-16.04/install-deps.sh deleted file mode 120000 index fc9c78b27ff6..000000000000 --- a/src/test/ubuntu-16.04/install-deps.sh +++ /dev/null @@ -1 +0,0 @@ -../../../install-deps.sh \ No newline at end of file -- 2.47.3