Merge ~adam-collard/maas:2.7-release-scripts into maas:2.7

[Adam Collard]

Backport release scripts from master to 2.7

s/focal/bionic/

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index fd75122..1b10112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maas (2.7.3-0ubuntu2) bionic; urgency=medium
+
+  * Rebuild of MAAS 2.7.3 including UI LP: #1892542
+
+ -- Adam Collard <[e-mail]>  Mon, 24 Aug 2020 09:11:12 +0000
+
 maas (2.7.3-0ubuntu1) bionic; urgency=medium
 
   * New upstream release, MAAS 2.7.3.
diff --git a/utilities/release-build b/utilities/release-build
index e87da7c..3a94f92 100755
--- a/utilities/release-build
+++ b/utilities/release-build
@@ -1,17 +1,29 @@
 #!/bin/bash -e
+#
+# Build release packages for specified distro releases
+#
+# Usage:
+#  ./release-build bionic
+#
+# It's possible to override the packge build revision with DEB_BUILD_REV=n (by
+# default it's 1)
+#
+# If SKIP_UI_BUILD=1 is specified, the UI tree won't be rebuilt.
+#
 
-ROOTDIR="$(dirname "$(dirname "$(realpath "$0")")")"
-BUILDDIR="$ROOTDIR/build_pkg"
-PACKAGE_BUILD_AREA="$ROOTDIR/../build-area"
+# The package build revision
+DEB_BUILD_REV=${DEB_BUILD_REV:-1}
+# Whether to skip the UI build
+SKIP_UI_BUILD=${SKIP_UI_BUILD:-0}
 
-declare -A SUPPORTED_RELEASES
-SUPPORTED_RELEASES=(
-    [focal]=20.04
-    [eoan]=19.10
-    [disco]=19.04
+declare -A SUPPORTED_RELEASES=(
     [bionic]=18.04
 )
 
+ROOTDIR="$(dirname "$(dirname "$(realpath "$0")")")"
+BUILDDIR="$ROOTDIR/build_pkg"
+PACKAGE_BUILD_AREA="$ROOTDIR/../build-area"
+
 exit_error() {
     echo "$@" >&2
     exit 1
@@ -32,6 +44,9 @@ check_releases() {
 }
 
 build_source_package() {
+    if [ "$SKIP_UI_BUILD" != 1 ]; then
+        make -C "$ROOTDIR/src/maasui" clean build  # ensure the UI is updated
+    fi
     make -C "$ROOTDIR" package-tree
 }
 
@@ -44,13 +59,12 @@ ensure_changelog_author() {
 update_changelog_version() {
     local deb_version="$1"
     local release="$2"
-    local new_version="${deb_version}~${SUPPORTED_RELEASES[$release]}.1"
+    local new_version="${deb_version}~${SUPPORTED_RELEASES[$release]}.${DEB_BUILD_REV}"
     sed -i "1 s/(.*;/($new_version) $release;/" debian/changelog
 }
 
 
 # Main
-
 check_releases "$@"
 releases="$*"
 
diff --git a/utilities/release-upload b/utilities/release-upload
new file mode 100755
index 0000000..f3610a2
--- /dev/null
+++ b/utilities/release-upload
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+
+"""Validate and upload a MAAS deb release to a PPA."""
+
+from argparse import ArgumentParser, ArgumentTypeError, FileType, Namespace
+from pathlib import Path
+import re
+from subprocess import CalledProcessError, check_output, PIPE
+import sys
+from typing import Optional
+
+from packaging.version import Version
+
+
+class PPAURL:
+    """A PPA URL."""
+
+    url: str
+    release: Version
+    pocket: Optional[str]
+
+    _PPA_RE = re.compile(r"^ppa:maas/(?P<release>[0-9.]+)(-(?P<pocket>.*))?$")
+
+    def __init__(self, url: str):
+        match = self._PPA_RE.match(url)
+        if not match:
+            raise ArgumentTypeError("Invalid MAAS PPA URL")
+
+        self.url = url
+        matches = match.groupdict()
+        self.release = Version(matches["release"])
+        self.pocket = matches["pocket"]
+
+    def __str__(self) -> str:
+        return self.url
+
+    @property
+    def is_stable(self) -> bool:
+        return not self.pocket
+
+
+class ChangesFile(FileType):
+
+    _FILE_NAME_RE = re.compile(r"^maas_(?P<version>[^-]+)-.*_source.changes$")
+
+    def __call__(self, path: str):
+        fileobj = super().__call__(path)
+        base_path = Path(path).name
+        match = self._FILE_NAME_RE.match(base_path)
+        if not match:
+            raise ArgumentTypeError("Invalid changes file name.")
+        # add version
+        version = match.groupdict()["version"].replace("~", "")
+        fileobj.version = Version(version)
+        return fileobj
+
+
+def parse_args() -> Namespace:
+    parser = ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "ppa_url",
+        type=PPAURL,
+        help="PPA URL, e.g. ppa:maas/2.9",
+        metavar="PPA_URL",
+    )
+    parser.add_argument(
+        "changes_file",
+        type=ChangesFile(),
+        help="Path to .changes file to upload",
+        metavar="CHANGES_FILE",
+    )
+    parser.add_argument(
+        "--validate-only",
+        action="store_true",
+        help="Dry run, don't actually upload",
+    )
+    return parser.parse_args()
+
+
+def upload_ppa(ppa_url: str, changes_file: str):
+    try:
+        output = check_output(["dput", ppa_url, changes_file], stderr=PIPE)
+    except CalledProcessError as e:
+        sys.exit("Upload failed with message:\n" + e.stderr.decode())
+    print(output.decode(), end="")
+
+
+def release_version(version: Version):
+    """Return version as major.minor only."""
+    return "{}.{}".format(*version.release[:2])
+
+
+if __name__ == "__main__":
+    args = parse_args()
+    version = args.changes_file.version
+    ppa_version = args.ppa_url.release
+    changes_release = release_version(version)
+    ppa_release = release_version(ppa_version)
+    if changes_release != ppa_release:
+        sys.exit(
+            f"PPA ({ppa_release}) and changes file ({changes_release}) "
+            "versions don't match"
+        )
+    if (
+        version > ppa_version
+        and version.is_prerelease
+        and args.ppa_url.is_stable
+    ):
+        sys.exit(
+            "Can't upload prerelease version of a point release to stable PPA."
+        )
+    if not args.validate_only:
+        upload_ppa(str(args.ppa_url), args.changes_file.name)