From: Kefu Chai Date: Sun, 29 Aug 2021 13:43:23 +0000 (+0800) Subject: test/docker-test.sh: add support for fedora 34 and debian strech X-Git-Tag: v17.1.0~989^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=005cd1063d3edf1a0be3ab55c3b3dce8e824201d;p=ceph-ci.git 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 --- diff --git a/src/test/debian-jessie/Dockerfile.in b/src/test/debian-jessie/Dockerfile.in deleted file mode 100644 index a27526aedcc..00000000000 --- a/src/test/debian-jessie/Dockerfile.in +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2015 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 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 index dfdd39e6b2b..00000000000 --- 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 index fc9c78b27ff..00000000000 --- 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 index 00000000000..a27526aedcc --- /dev/null +++ b/src/test/debian-strech/Dockerfile.in @@ -0,0 +1,31 @@ +# +# Copyright (C) 2015 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 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 index 00000000000..dfdd39e6b2b --- /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 index 00000000000..fc9c78b27ff --- /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 index 3598271f6ae..00000000000 --- a/src/test/fedora-31/Dockerfile.in +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2015 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 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 index 9abcafd12db..00000000000 --- 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 index fc9c78b27ff..00000000000 --- 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 index d389c4ca923..00000000000 --- 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 d389c4ca923..00000000000 --- 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 index 00000000000..3598271f6ae --- /dev/null +++ b/src/test/fedora-33/Dockerfile.in @@ -0,0 +1,26 @@ +# +# Copyright (C) 2015 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 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 index 00000000000..9abcafd12db --- /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 index 00000000000..fc9c78b27ff --- /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 index 00000000000..b2efdfaff9c --- /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 1f006663967..00000000000 --- 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 dfdd39e6b2b..00000000000 --- 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 fc9c78b27ff..00000000000 --- a/src/test/ubuntu-16.04/install-deps.sh +++ /dev/null @@ -1 +0,0 @@ -../../../install-deps.sh \ No newline at end of file