]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
ftests: Update the container to Ubuntu 22.04
authorTom Hromatka <tom.hromatka@oracle.com>
Thu, 15 Sep 2022 19:05:25 +0000 (13:05 -0600)
committerTom Hromatka <tom.hromatka@oracle.com>
Thu, 15 Sep 2022 19:05:25 +0000 (13:05 -0600)
Switch to the latest stable Ubuntu for the functional tests.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
ftests/consts.py
ftests/ftests.py

index 8d5b67455fc0743bddb9d9e9cb2e8236ffc6bd4b..7891aaceff1c94ddfc92c9178743d9ecddca2a60 100644 (file)
@@ -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
 
index 38c6c0b71b2be2e93dd19645a0259f7899bf03b3..d888fcd9e30602dec7ff16e04ed0961cd05660c2 100755 (executable)
@@ -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 = ([