ubuntu trusty is not on LXC any more

I can't get the really old versions to run on Bionic. I hope this means nobody uses them any more.

.github/workflows/ci.yml

@@ -17,16 +17,8 @@ jobs:
         include:
           - SELECT: nose
             OLD_REV: "HEAD"
-            OLD_UBUNTU: bionic
           - SELECT: nose
             OLD_REV: "v0.3.0"
-            OLD_UBUNTU: bionic
-          - SELECT: nose
-            OLD_REV: "4e4f13cdc630c46909d47441093a5bdaffa0d67f"
-            OLD_UBUNTU: trusty
-          - SELECT: nose
-            OLD_REV: "c638231efca6b3a6e1c675ac0834a3e851ad1bdc"
-            OLD_UBUNTU: trusty
           - SELECT: usage
           - SELECT: client
     runs-on: ubuntu-20.04

tests/test_nose.py

@@ -20,15 +20,12 @@
 CLIENT_PID = None
 
 LOG = logging.getLogger("test_nose")
-DEFAULT_UBUNTU = "bionic"
 
 def setup_module():
     global CONTEXT, SERVER, CLIENT, SERVER_PID, CLIENT_PID
     CONTEXT = tunneldigger.get_random_context()
     LOG.info("using context %s", CONTEXT)
-    CLIENT, SERVER = tunneldigger.prepare_containers(CONTEXT,
-                            os.environ['CLIENT_REV'], DEFAULT_UBUNTU,
-                            os.environ['SERVER_REV'], os.environ.get('SERVER_UBUNTU', DEFAULT_UBUNTU))
+    CLIENT, SERVER = tunneldigger.prepare_containers(CONTEXT, os.environ['CLIENT_REV'], os.environ['SERVER_REV'])
     SERVER_PID = tunneldigger.run_server(SERVER)
     CLIENT_PID = tunneldigger.run_client(CLIENT, ['-b', '172.16.16.1:8942'])
 

tests/test_usage.py

@@ -40,8 +40,8 @@ def test_usage(self):
 
         servers = ['172.16.16.100', '172.16.16.101', '172.16.16.102']
         cont_first = tunneldigger.prepare('server', CONTEXT + '_first_server', os.environ['CLIENT_REV'], bridge_name, servers[0]+'/24')
-        cont_second = tunneldigger.prepare('server', CONTEXT + '_second_server', USAGE_REV, bridge_name, servers[1]+'/24', "trusty")
-        cont_nonusage = tunneldigger.prepare('server', CONTEXT + '_third_server', NONUSAGE_REV, bridge_name, servers[2]+'/24', "trusty")
+        cont_second = tunneldigger.prepare('server', CONTEXT + '_second_server', USAGE_REV, bridge_name, servers[1]+'/24')
+        cont_nonusage = tunneldigger.prepare('server', CONTEXT + '_third_server', NONUSAGE_REV, bridge_name, servers[2]+'/24')
         cont_all_servers = [cont_first, cont_second, cont_nonusage]
 
         cont_dummy_client = tunneldigger.prepare('client', CONTEXT + '_dummy_client', os.environ['CLIENT_REV'],

tests/travis.sh

@@ -25,9 +25,6 @@ set -ex
 
 # finish setup
 $(dirname $0)/tunneldigger.py --setup bionic
-if [[ "$OLD_UBUNTU" == "trusty" || "$SELECT" == "usage" ]]; then
-    $(dirname $0)/tunneldigger.py --setup trusty
-fi
 
 # run required test
 

tests/tunneldigger.py

@@ -22,7 +22,7 @@ def setup_template(ubuntu_release):
     """ all test container are cloned from this one
     it's important that this container is *NOT* running!
     """
-    container = lxc.Container("tunneldigger-base-{}".format(ubuntu_release))
+    container = lxc.Container("tunneldigger-base")
 
     if not container.defined:
         for i in range(0, 5): # retry a few times, this tends to fail spuriously on travis
@@ -165,14 +165,14 @@ def testing(client_rev, server_rev):
         raise RuntimeError('Tunneldigger client can not connect to the server')
     run_tests(server, client)
 
-def prepare(cont_type, name, revision, bridge, ip_netmask='172.16.16.1/24', ubuntu_release="bionic"):
+def prepare(cont_type, name, revision, bridge, ip_netmask='172.16.16.1/24'):
     if cont_type not in ['server', 'client']:
         raise RuntimeError('Unknown container type given')
     if lxc.Container(name).defined:
         raise RuntimeError('Container "%s" already exist!' % name)
-    LOG.info("Preparing %s on Ubuntu %s" % (cont_type, ubuntu_release))
+    LOG.info("Preparing %s" % cont_type)
 
-    base = lxc.Container("tunneldigger-base-{}".format(ubuntu_release))
+    base = lxc.Container("tunneldigger-base")
 
     if not base.defined:
         raise RuntimeError("Setup first the base container")
@@ -206,7 +206,7 @@ def prepare(cont_type, name, revision, bridge, ip_netmask='172.16.16.1/24', ubun
     LOG.info("Finished prepare_server %s", name)
     return cont
 
-def prepare_containers(context, client_rev, client_ubuntu_release, server_rev, server_ubuntu_release):
+def prepare_containers(context, client_rev, server_rev):
     """ this does the real test.
     - cloning containers from tunneldigger-base
     - setup network
@@ -222,8 +222,8 @@ def prepare_containers(context, client_rev, client_ubuntu_release, server_rev, s
     bridge_name = "br-%s" % context
 
     create_bridge(bridge_name)
-    server = prepare('server', server_name, server_rev, bridge_name, '172.16.16.1/24', server_ubuntu_release)
-    client = prepare('client', client_name, client_rev, bridge_name, '172.16.16.100/24', client_ubuntu_release)
+    server = prepare('server', server_name, server_rev, bridge_name, '172.16.16.1/24')
+    client = prepare('client', client_name, client_rev, bridge_name, '172.16.16.100/24')
 
     return client, server