launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:ols-vms into turnip:master.

Commit message:
Add Jenkins test configuration

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This is guesswork and may well need a bit more work, but with any luck it's approximately enough to allow a Jenkaas-based merge.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:ols-vms into turnip:master.

diff --git a/.gitignore b/.gitignore
index 6912b70..fb9d39c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 bin
 build
+dependencies
 develop-eggs
 dist
 download-cache
diff --git a/Makefile b/Makefile
index 80bf28c..8e57063 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ FLAKE8 := $(ENV)/bin/flake8
 PIP := $(ENV)/bin/pip
 VIRTUALENV := virtualenv
 
+DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
+
 PIP_CACHE_ARGS := -q
 ifneq ($(PIP_SOURCE_DIR),)
 PIP_CACHE_ARGS += --no-index --find-links=file://$(realpath $(PIP_SOURCE_DIR))/
@@ -25,13 +27,21 @@ TARBALL_BUILD_PATH = $(TARBALL_BUILD_DIR)/$(TARBALL_FILE_NAME)
 
 build: $(ENV)
 
+bootstrap:
+	if [ -d dependencies ]; then \
+		git -C dependencies pull; \
+	else \
+		git clone $(DEPENDENCIES_URL) dependencies; \
+	fi
+	$(MAKE) PIP_SOURCE_DIR=dependencies
+
 turnip/version_info.py:
 	echo 'version_info = {"revision_id": "$(TARBALL_BUILD_LABEL)"}' >$@
 
 $(ENV): turnip/version_info.py
 ifeq ($(PIP_SOURCE_DIR),)
 	@echo "Set PIP_SOURCE_DIR to the path of a clone of" >&2
-	@echo "lp:~canonical-launchpad-branches/turnip/+git/dependencies." >&2
+	@echo "$(DEPENDENCIES_URL)." >&2
 	@exit 1
 endif
 	mkdir -p $(ENV)
@@ -45,7 +55,7 @@ endif
 		-e '.[test,deploy]'
 
 check: $(ENV)
-	$(PYTHON) -m unittest discover turnip
+	$(PYTHON) -m unittest discover $(ARGS) turnip
 
 clean:
 	find turnip -name '*.py[co]' -exec rm '{}' \;
diff --git a/dependencies.txt b/dependencies.txt
new file mode 100644
index 0000000..612b035
--- /dev/null
+++ b/dependencies.txt
@@ -0,0 +1,7 @@
+build-essential
+cgit
+git
+libffi-dev
+libgit2-dev
+python-dev
+python-virtualenv
diff --git a/ols-vms.conf b/ols-vms.conf
new file mode 100644
index 0000000..c72c493
--- /dev/null
+++ b/ols-vms.conf
@@ -0,0 +1,16 @@
+# Options defined here provide defaults for all sections
+vm.architecture = amd64
+vm.release = trusty
+
+# pygit2
+apt.sources = ppa:launchpad/ppa
+vm.packages = @dependencies.txt
+
+[turnip]
+vm.class = lxd
+vm.update = True
+vm.poweroff = True
+
+[turnip-worker]
+vm.class = ephemeral-lxd
+vm.backing = turnip