From 0815a59287c8714991d259de06b994e0ed2abf54 Mon Sep 17 00:00:00 2001 From: Po-Hsu Lin Date: Wed, 9 Nov 2016 19:13:28 +0800 Subject: [PATCH] Update Ubuntu release name: add zesty and remove wily Add zesty to KNOWN_RELEASES Remove EOL wily from KNOWN_RELEASES Signed-off-by: Po-Hsu Lin --- src/tests/lxc-test-apparmor-mount | 2 +- src/tests/lxc-test-autostart | 2 +- src/tests/lxc-test-unpriv | 2 +- src/tests/lxc-test-usernic.in | 2 +- templates/lxc-ubuntu-cloud.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount index 7ec5aadb8..74fd8c6f8 100755 --- a/src/tests/lxc-test-apparmor-mount +++ b/src/tests/lxc-test-apparmor-mount @@ -42,7 +42,7 @@ run_cmd() { } DONE=0 -KNOWN_RELEASES="precise trusty wily xenial yakkety" +KNOWN_RELEASES="precise trusty xenial yakkety zesty" MOUNTSR=/sys/kernel/security/apparmor/features/mount dnam=`mktemp -d` cname=`basename $dnam` diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart index 76de54ba7..61dbdf11d 100755 --- a/src/tests/lxc-test-autostart +++ b/src/tests/lxc-test-autostart @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA DONE=0 -KNOWN_RELEASES="precise trusty wily xenial yakkety" +KNOWN_RELEASES="precise trusty xenial yakkety zesty" cleanup() { lxc-destroy -n $CONTAINER_NAME >/dev/null 2>&1 || true diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv index eddfd55f5..afe86fa41 100755 --- a/src/tests/lxc-test-unpriv +++ b/src/tests/lxc-test-unpriv @@ -30,7 +30,7 @@ fi which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; } DONE=0 -KNOWN_RELEASES="precise trusty wily xenial yakkety" +KNOWN_RELEASES="precise trusty xenial yakkety zesty" cleanup() { cd / diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in index d63b6bba4..42a9a215f 100755 --- a/src/tests/lxc-test-usernic.in +++ b/src/tests/lxc-test-usernic.in @@ -24,7 +24,7 @@ # This test assumes an Ubuntu host DONE=0 -KNOWN_RELEASES="precise trusty wily xenial yakkety" +KNOWN_RELEASES="precise trusty xenial yakkety zesty" LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic" cleanup() { diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in index 7ae10c8ca..58642a9dd 100644 --- a/templates/lxc-ubuntu-cloud.in +++ b/templates/lxc-ubuntu-cloud.in @@ -25,7 +25,7 @@ STATE_DIR="@LOCALSTATEDIR@" HOOK_DIR="@LXCHOOKDIR@" CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep" LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@" -KNOWN_RELEASES="precise trusty wily xenial yakkety" +KNOWN_RELEASES="precise trusty xenial yakkety zesty" skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0} # Make sure the usual locations are in PATH -- 2.47.2