Merge lp:~canonical-platform-qa/qa-jenkins-jobs/dynamic-upgrade-testing into lp:qa-jenkins-jobs

[Max Brustkern]

Generate list of upgrade tests from branch using Makefile

This branch implements a Makefile to generate a list of auto-upgrade-testing jobs from a branch, which defaults to lp:auto-upgrade-testing-specifications

The make process is incorporated into deploy-jobs.sh, meaning its use is now recommended over other deployment methods, as they will not correctly include the upgrade tests.

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:52
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/dynamic-upgrade-testing/+merge/296846/+edit-commit-message

https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/4/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/371
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/371/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/371
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/371/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/326/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

review: Approve (continuous-integration)

=== modified file 'Makefile'
--- Makefile	2016-05-19 20:02:19 +0000
+++ Makefile	2016-06-08 19:04:10 +0000
@@ -1,6 +1,9 @@
-all:
-
-install:
+.PHONY: jobs install clean
+
+jobs:
+	$(MAKE) -C jobs
+
+install: jobs
 	mkdir -p "$$DESTDIR/usr/bin"
 	for FILE in $$(find scripts -name *.sh); do \
 		NEWNAME=$$(basename "$$FILE" | sed 's/\.sh//'); \
@@ -8,3 +11,6 @@
 	done
 	mkdir -p "$$DESTDIR/usr/share"
 	cp -r jobs "$$DESTDIR/usr/share/qa-jenkins-jobs"
+
+clean:
+	$(MAKE) -C jobs clean

=== added file 'jobs/Makefile'
--- jobs/Makefile	1970-01-01 00:00:00 +0000
+++ jobs/Makefile	2016-06-08 19:04:10 +0000
@@ -0,0 +1,7 @@
+.PHONY: auto-upgrade-testing clean
+
+auto-upgrade-testing:
+	$(MAKE) -C auto-upgrade-testing
+
+clean:
+	$(MAKE) -C auto-upgrade-testing clean

=== added file 'jobs/auto-upgrade-testing/Makefile'
--- jobs/auto-upgrade-testing/Makefile	1970-01-01 00:00:00 +0000
+++ jobs/auto-upgrade-testing/Makefile	2016-06-08 19:04:10 +0000
@@ -0,0 +1,7 @@
+.PHONY: clean
+
+profiles:
+	../../scripts/generate-upgrade-testing-profiles-from-branch.sh > profiles
+
+clean:
+	rm -f profiles

=== modified file 'jobs/auto-upgrade-testing/jobs.yaml'
--- jobs/auto-upgrade-testing/jobs.yaml	2016-04-27 21:26:00 +0000
+++ jobs/auto-upgrade-testing/jobs.yaml	2016-06-08 19:04:10 +0000
@@ -19,27 +19,7 @@
     # Requires: Post Build Script plugin.
     name: auto-upgrade-testing
     # TODO: automatically generate this list, possibly with a blacklist
-    profile:
-        - ubuntu-precise-xenial-basic-amd64_lxc
-        - ubuntu-precise-xenial-basic-i386_lxc
-        - ubuntu-trusty-xenial-basic-amd64_qemu
-        - ubuntu-trusty-xenial-basic-i386_qemu
-        - ubuntu-trusty-xenial-desktop-amd64_qemu
-        - ubuntu-trusty-xenial-desktop-i386_qemu
-        - ubuntu-trusty-xenial-basic-amd64_lxc
-        - ubuntu-trusty-xenial-basic-i386_lxc
-        - ubuntu-trusty-xenial-desktop-amd64_lxc
-        - ubuntu-trusty-xenial-desktop-i386_lxc
-        - ubuntu-wily-xenial-basic-amd64_qemu
-        - ubuntu-wily-xenial-basic-i386_qemu
-        - ubuntu-wily-xenial-desktop-amd64_qemu
-        - ubuntu-wily-xenial-desktop-i386_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-utopic-amd64_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-utopic-i386_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-vivid-amd64_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-vivid-i386_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-wily-amd64_qemu
-        - ubuntu-trusty-xenial-desktop-hwe-wily-i386_qemu
+    profile: !include: 'profiles'
     jobs:
         - upgrade_{profile}
 

=== modified file 'scripts/deploy-jobs.sh'
--- scripts/deploy-jobs.sh	2016-05-17 21:10:40 +0000
+++ scripts/deploy-jobs.sh	2016-06-08 19:04:10 +0000
@@ -10,4 +10,5 @@
         ARGS="update";;
 esac
 
+make -C "$JOB_PATH"
 python -m jenkins_jobs.cmd $ARGS -r "$JOB_PATH"

=== added file 'scripts/generate-upgrade-testing-profiles-from-branch.sh'
--- scripts/generate-upgrade-testing-profiles-from-branch.sh	1970-01-01 00:00:00 +0000
+++ scripts/generate-upgrade-testing-profiles-from-branch.sh	2016-06-08 19:04:10 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export BRANCH=${UPGRADE_TESTING_SPECIFICATIONS_BRANCH-lp:auto-upgrade-testing-specifications}
+
+bzr ls $BRANCH/profiles | grep "$BRANCH/profiles/[^/]*\.yaml" | grep -o "[^/]*\.yaml$" | sed 's/^/        - /;s/\.yaml$//' > profiles