launchpad-reviewers team mailing list archive

[Colin Watson <mp+439226@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:bionic into lp-codeimport:master.

Commit message:
Build deployment artifact for bionic

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/439226

Building for focal would be harder, because we're still on Python 2 here for a few reasons and focal no longer has all the dependencies we need.  bionic still seems to work fine though, so we might as well upgrade at least that far.

To avoid causing problems for incautious upgrades of existing xenial deployments, I've introduced a new `-bionic` suffix on the build label; deployment artifacts are built with and for particular Ubuntu series, so it makes sense to annotate them.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:bionic into lp-codeimport:master.

diff --git a/Makefile b/Makefile
index d3a6bcf..ff06eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ PIP_BIN = \
 
 # Create archives in labelled directories (e.g.
 # <rev-id>/$(PROJECT_NAME).tar.gz)
-TARBALL_BUILD_LABEL ?= $(shell git rev-parse HEAD)
+TARBALL_BUILD_LABEL ?= $(shell git rev-parse HEAD)-bionic
 TARBALL_FILE_NAME = lp-codeimport.tar.gz
 TARBALL_BUILDS_DIR ?= build
 TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)
diff --git a/ols-vms.conf b/ols-vms.conf
index e5ac5a5..db588b7 100644
--- a/ols-vms.conf
+++ b/ols-vms.conf
@@ -1,6 +1,6 @@
 # Options defined here provide defaults for all sections
 vm.architecture = amd64
-vm.release = xenial
+vm.release = bionic
 
 apt.sources = ppa:launchpad/ppa
 vm.packages = @system-dependencies.txt, python3-swiftclient, @charm/packages.txt