From: Kefu Chai <kchai@redhat.com>
Date: Mon, 26 Nov 2018 03:18:13 +0000 (+0800)
Subject: tests: add ubuntu 18.04 dockerfile
X-Git-Tag: v14.1.0~802^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fb93fda50f4514cd8e0c967ded29174284b57dc8;p=ceph-ci.git

tests: add ubuntu 18.04 dockerfile

ubuntu bionic is an LTS release. while 17.04 is not. so move 17.04 to
18.04

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

diff --git a/src/test/ubuntu-17.04/Dockerfile.in b/src/test/ubuntu-17.04/Dockerfile.in
deleted file mode 100644
index 1f006663967..00000000000
--- a/src/test/ubuntu-17.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-17.04/debian b/src/test/ubuntu-17.04/debian
deleted file mode 120000
index 61c3c9f50e3..00000000000
--- a/src/test/ubuntu-17.04/debian
+++ /dev/null
@@ -1 +0,0 @@
-../../../debian/
\ No newline at end of file
diff --git a/src/test/ubuntu-17.04/install-deps.sh b/src/test/ubuntu-17.04/install-deps.sh
deleted file mode 120000
index fc9c78b27ff..00000000000
--- a/src/test/ubuntu-17.04/install-deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../install-deps.sh
\ No newline at end of file
diff --git a/src/test/ubuntu-18.04/Dockerfile.in b/src/test/ubuntu-18.04/Dockerfile.in
new file mode 100644
index 00000000000..1f006663967
--- /dev/null
+++ b/src/test/ubuntu-18.04/Dockerfile.in
@@ -0,0 +1,31 @@
+#
+# 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-18.04/debian b/src/test/ubuntu-18.04/debian
new file mode 120000
index 00000000000..61c3c9f50e3
--- /dev/null
+++ b/src/test/ubuntu-18.04/debian
@@ -0,0 +1 @@
+../../../debian/
\ No newline at end of file
diff --git a/src/test/ubuntu-18.04/install-deps.sh b/src/test/ubuntu-18.04/install-deps.sh
new file mode 120000
index 00000000000..fc9c78b27ff
--- /dev/null
+++ b/src/test/ubuntu-18.04/install-deps.sh
@@ -0,0 +1 @@
+../../../install-deps.sh
\ No newline at end of file