Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:esm-chroot-names-3 into ubuntu-security-tools:master

[Spyros Seimenis]

Reverting previous changes to chroot name handling for a potentially better approach.

1) A bug was fixed in umt so that ESM releases gets properly detected from the file path and matched against the release_list in .ubuntu-security-tools.conf. Packages built for an ESM release will now have the details['release'] properly filled (i.e esm-infra/xenial) and another field details['base_release'] will be used to hold the base release name (i.e xenial).

2) Since chroot names cannot have a '/' (similarly to the paths when downloading a package for an ESM release), '/' is replaced with '_' to match release names.

3) With 1,2 in place, chroot names for ESM can follow the standard convention of <release>-<arch> so that they are detected automatically from umt. The difference now is that <release> can be any of the form esm-X_<base_release> or <release>_esm (trusty only) so different chroots for different releases are needed.

[Alex Murray (alexmurray)]

LGTM but I think perhaps it would be nicer to avoid all the duplicated code for the chroot release name - see suggestion inline.

review: Needs Fixing

[Spyros Seimenis (sespiros)]

Thanks for the suggestion Alex. I kept the old style of concatenating strings since from a quick search I couldn't decide what's the best way to concat strings in Python (between using format(), %, + or the newer f strings.

[Alex Murray (alexmurray)]

Thanks, LGTM!

review: Approve

diff --git a/build-tools/umt b/build-tools/umt
index 41c979c..1ab74f9 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -524,18 +524,12 @@ def perform_source_build(details, opt):
         if "ubuntu1" in details['base_version']:
             prepare_merge_debdiff(opt.start_version, details['package'])
 
-    chroot = details['release']
-
-    if 'esm' in details['version']:
-        chroot += "-esm"
+    chroot_release = details['release'].replace('/','_')
 
+    details['chroot'] = "%s-i386" % chroot_release
     (rc, arch) = runcmd(['uname', '-m'])
     if arch.strip() == "x86_64":
-        chroot += "-amd64"
-    else:
-        chroot += "-i386"
-
-    details['chroot'] = chroot
+        details['chroot'] = "%s-amd64" % chroot_release
 
     if opt.chroot:
         details['chroot'] = opt.chroot
@@ -639,18 +633,12 @@ def perform_binary_build(details, opt):
     if opt.hardening:
         extra_deps.append('hardening-wrapper')
 
-    chroot = details['release']
-
-    if 'esm' in details['version']:
-        chroot += "-esm"
+    chroot_release = details['release'].replace('/','_')
 
+    details['chroot'] = "%s-i386" % chroot_release
     (rc, arch) = runcmd(['uname', '-m'])
     if arch.strip() == "x86_64":
-        chroot += "-amd64"
-    else:
-        chroot += "-i386"
-
-    details['chroot'] = chroot
+        details['chroot'] = "%s-amd64" % chroot_release
 
     if opt.chroot:
         details['chroot'] = opt.chroot
@@ -4033,6 +4021,7 @@ def parse_package_details(release = None, skip_sanity = False, force_component =
     else:
         # Attempt to calculate release based on directory path naming
         guess = os.path.basename(os.path.dirname(os.getcwd()))
+        guess = guess.replace('_','/')
         releases = ust['release_list'].split()
         for r in releases:
             if r == guess:
@@ -4042,6 +4031,16 @@ def parse_package_details(release = None, skip_sanity = False, force_component =
         # If we didn't find a match, fall back to the devel release
         details.setdefault('release', details['changelog_release'])
 
+    # Find base release
+    base_release = details["release"]
+    if 'esm' in base_release:
+        if 'trusty' in base_release:
+            base_release = 'trusty'
+        else:
+            base_release = base_release.split('/')[1]
+
+    details['base_release'] = base_release
+
     # Find previous version
     previous_version = ''
     if override_previous:
@@ -4070,8 +4069,8 @@ def parse_package_details(release = None, skip_sanity = False, force_component =
     # Perform sanity checking
     if not skip_sanity:
         # Sanity check release
-        if details['changelog_release'] != details['release']:
-            err("oops! changelog release (%s) != '%s'" % (details['changelog_release'], details['release']))
+        if details['changelog_release'] != details['base_release']:
+            err("oops! changelog release (%s) != '%s'" % (details['changelog_release'], details['base_release']))
             sys.exit(1)
         # Sanity check pocket
         if (details['release'] != ust['release_devel']) and (details['release'] != 'unstable') and \
@@ -4588,7 +4587,8 @@ def build_binary(dscfile, buildopts, script, chroot, ulimit):
         # the wrong architecture.(Debian #609151)
         chroot_args = [ '-d', chroot ]
         if '-' in chroot:
-            (dist, arch) = chroot.split('-')[0:2]
+            (dist, arch) = chroot.rsplit('-', 1)
+            dist = dist.replace('_','/')
             # qemu-static-user allows to emulate most of these on amd64 in
             # groovy so assume we can use any if specified - from
             # https://wiki.ubuntu.com/SecurityTeam/FAQ#Architectures