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 <tchaikov@gmail.com>

diff --git a/src/test/debian-jessie/Dockerfile.in b/src/test/debian-jessie/Dockerfile.in
deleted file mode 100644 (file)
index a27526a..0000000
--- a/src/test/debian-jessie/Dockerfile.in
+++ /dev/null
@@ -1,31 +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 debian:%%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 sudo ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet
-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/debian-jessie/debian b/src/test/debian-jessie/debian
deleted file mode 120000 (symlink)
index dfdd39e..0000000
--- a/src/test/debian-jessie/debian
+++ /dev/null
@@ -1 +0,0 @@
-../../../debian
\ No newline at end of file

diff --git a/src/test/debian-jessie/install-deps.sh b/src/test/debian-jessie/install-deps.sh
deleted file mode 120000 (symlink)
index fc9c78b..0000000
--- a/src/test/debian-jessie/install-deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../install-deps.sh
\ No newline at end of file

diff --git a/src/test/debian-strech/Dockerfile.in b/src/test/debian-strech/Dockerfile.in
new file mode 100644 (file)
index 0000000..a27526a
--- /dev/null
+++ b/src/test/debian-strech/Dockerfile.in
@@ -0,0 +1,31 @@
+#
+# 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 debian:%%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 sudo ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet
+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/debian-strech/debian b/src/test/debian-strech/debian
new file mode 120000 (symlink)
index 0000000..dfdd39e
--- /dev/null
+++ b/src/test/debian-strech/debian
@@ -0,0 +1 @@
+../../../debian
\ No newline at end of file

diff --git a/src/test/debian-strech/install-deps.sh b/src/test/debian-strech/install-deps.sh
new file mode 120000 (symlink)
index 0000000..fc9c78b
--- /dev/null
+++ b/src/test/debian-strech/install-deps.sh
@@ -0,0 +1 @@
+../../../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
deleted file mode 100644 (file)
index 3598271..0000000
--- a/src/test/fedora-31/Dockerfile.in
+++ /dev/null
@@ -1,26 +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 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
deleted file mode 120000 (symlink)
index 9abcafd..0000000
--- a/src/test/fedora-31/ceph.spec.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 120000 (symlink)
index fc9c78b..0000000
--- a/src/test/fedora-31/install-deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../install-deps.sh
\ No newline at end of file

diff --git a/src/test/fedora-32 b/src/test/fedora-32
deleted file mode 120000 (symlink)
index d389c4c..0000000
--- 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 (symlink)
index d389c4c..0000000
--- a/src/test/fedora-33
+++ /dev/null
@@ -1 +0,0 @@
-fedora-31
\ No newline at end of file

diff --git a/src/test/fedora-33/Dockerfile.in b/src/test/fedora-33/Dockerfile.in
new file mode 100644 (file)
index 0000000..3598271
--- /dev/null
+++ b/src/test/fedora-33/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-33/ceph.spec.in b/src/test/fedora-33/ceph.spec.in
new file mode 120000 (symlink)
index 0000000..9abcafd
--- /dev/null
+++ b/src/test/fedora-33/ceph.spec.in
@@ -0,0 +1 @@
+../../../ceph.spec.in
\ No newline at end of file

diff --git a/src/test/fedora-33/install-deps.sh b/src/test/fedora-33/install-deps.sh
new file mode 120000 (symlink)
index 0000000..fc9c78b
--- /dev/null
+++ b/src/test/fedora-33/install-deps.sh
@@ -0,0 +1 @@
+../../../install-deps.sh
\ No newline at end of file

diff --git a/src/test/fedora-34 b/src/test/fedora-34
new file mode 120000 (symlink)
index 0000000..b2efdfa
--- /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 (file)
index 1f00666..0000000
--- a/src/test/ubuntu-16.04/Dockerfile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2016 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 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 (symlink)
index dfdd39e..0000000
--- 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 (symlink)
index fc9c78b..0000000
--- a/src/test/ubuntu-16.04/install-deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../install-deps.sh
\ No newline at end of file