From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Thu, 15 Sep 2022 19:12:41 +0000 (-0600)
Subject: ftests: Update the container to Ubuntu 22.04
X-Git-Tag: v2.0.3~11^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6a81cd2dae4716674b09e01324aa1c8087c5ac;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 <tom.hromatka@oracle.com>
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 45f37aedda04d2ab4679eb667aef49e2d3c2328f)
---

diff --git a/ftests/consts.py b/ftests/consts.py
index 8e4b6037..eace57b6 100644
--- a/ftests/consts.py
+++ b/ftests/consts.py
@@ -34,7 +34,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 cedf98df..681f48d8 100755
--- a/ftests/ftests.py
+++ b/ftests/ftests.py
@@ -175,9 +175,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
         echo_cmd = ['bash', '-c', 'echo {} >> /etc/ld.so.conf.d/libcgroup.conf'.format(
                    os.path.join(consts.LIBCG_MOUNT_POINT, 'src/.libs'))]