From: Tom Hromatka Date: Thu, 15 Sep 2022 19:05:25 +0000 (-0600) Subject: ftests: Update the container to Ubuntu 22.04 X-Git-Tag: v3.1.0~308^2~2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45f37aedda04d2ab4679eb667aef49e2d3c2328f;p=thirdparty%2Flibcgroup.git ftests: Update the container to Ubuntu 22.04 Switch to the latest stable Ubuntu for the functional tests. Signed-off-by: Tom Hromatka Reviewed-by: Kamalesh Babulal --- diff --git a/ftests/consts.py b/ftests/consts.py index 8d5b6745..7891aace 100644 --- a/ftests/consts.py +++ b/ftests/consts.py @@ -21,7 +21,7 @@ LIBCG_MOUNT_POINT = os.path.dirname(tests_dir) DEFAULT_CONTAINER_NAME = 'TestLibcg' DEFAULT_CONTAINER_DISTRO = 'ubuntu' -DEFAULT_CONTAINER_RELEASE = '18.04' +DEFAULT_CONTAINER_RELEASE = '22.04' DEFAULT_CONTAINER_ARCH = 'amd64' DEFAULT_CONTAINER_STOP_TIMEOUT = 5 diff --git a/ftests/ftests.py b/ftests/ftests.py index 38c6c0b7..d888fcd9 100755 --- a/ftests/ftests.py +++ b/ftests/ftests.py @@ -220,9 +220,6 @@ def setup(config, do_teardown=True, record_time=False): config.container.config() config.container.start() - # LXC on Ubuntu 20.04 put sed in a different spot. Add a symlink - config.container.run(['ln', '-s', '/bin/sed', '/usr/bin/sed']) - # add the libcgroup library to the container's ld libcgrp_lib_path = os.path.join(consts.LIBCG_MOUNT_POINT, 'src/.libs') echo_cmd = ([