← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/turnip:deployment-artifact-series into turnip:master

 

Colin Watson has proposed merging ~cjwatson/turnip:deployment-artifact-series into turnip:master.

Commit message:
Add series name to deployment artifact

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/442829

We'll want to upgrade off bionic at some point, but that needs to be handled carefully: new Juju units will need to be deployed using deployment artifacts built for the appropriate Python version.  To make it easier to see what's going on, add the Ubuntu series name as a suffix to 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/turnip:deployment-artifact-series into turnip:master.
diff --git a/Makefile b/Makefile
index 035c607..7fe3352 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ PIP_ENV += PIP_FIND_LINKS="$(PIP_FIND_LINKS)"
 
 # 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 = turnip.tar.gz
 TARBALL_BUILDS_DIR ?= build
 TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)