diff --git a/debian/changelog b/debian/changelog
index 945fb320882ae03fe4616f36a34d89c16aba5297..3cadc7ffee15815f5df9982775c6f22f49c93324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apertis-tests (1:0.20160928.1) UNRELEASED; urgency=medium
+
+ * Branch for 16.09
+ - debian/gbp.conf: use this branch
+ - templates/*.json: run tests from 16.09 branch
+
+ -- Simon McVittie <simon.mcvittie@collabora.co.uk> Fri, 30 Sep 2016 17:46:48 +0100
+
apertis-tests (1:0.20160928.0) 16.09; urgency=medium
[ Luis Araujo ]
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a28bfb6139b7b2357ac55bbd55d51ff48fd69a66..e00cdc26f6a8a492a9c21d2b56af76db708e2c14 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
debian-tag = apertis/%(version)s
-debian-branch = master
+debian-branch = 16.09
pristine-tar = True
[dch]
diff --git a/templates/group-apparmor-tpl.json b/templates/group-apparmor-tpl.json
index 8dcd915493d0a4e35625df95741bfc6dc5b8e578..eea644fb50c1d9f3c65bc81a77b2ea30b150e8e7 100644
--- a/templates/group-apparmor-tpl.json
+++ b/templates/group-apparmor-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
},
{
@@ -43,7 +43,7 @@
in preparation for running
apparmor-session-lockdown-no-deny.yaml after the reboot. #}
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-session-lockdown-no-deny-before-reboot.yaml"
}
]
@@ -56,69 +56,69 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
{# This one must be shortly after a reboot, before which we must
run apparmor-session-lockdown-before-reboot.yaml. #}
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-session-lockdown-no-deny.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-basic-profiles.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-chaiwala-system.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-dbus.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-folks.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-functional-demo.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-gstreamer1-0.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-libreoffice.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-pulseaudio.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-tumbler.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-utils.yaml"
}
]
@@ -131,12 +131,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "apparmor/apparmor-geoclue.yaml"
}
]
diff --git a/templates/group-clutter-tpl.json b/templates/group-clutter-tpl.json
index 458067c54914b7944c890fe611874b54904953bd..4f8794cbe03537ebde282243fbfc796cd07bf924 100644
--- a/templates/group-clutter-tpl.json
+++ b/templates/group-clutter-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
@@ -48,12 +48,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "clutter/clutter-performance.yaml"
}
]
@@ -66,12 +66,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "clutter/webkit-clutter-javascriptcore.yaml"
}
]
diff --git a/templates/group-common-tpl.json b/templates/group-common-tpl.json
index c33e333ae79e1043ddbe49b53fa5d479b1f7f0cd..111dbf0c882d298fe78b5337109434b2df9fa5b4 100644
--- a/templates/group-common-tpl.json
+++ b/templates/group-common-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
@@ -48,17 +48,17 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/boot-no-crashes.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/boot-performance.yaml"
}
]
@@ -71,12 +71,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/cgroups-resource-control.yaml"
}
]
@@ -89,12 +89,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/connman.yaml"
}
]
@@ -107,12 +107,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/connman-new-supplicant.yaml"
}
]
@@ -125,17 +125,17 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "dbus/dbus-installed-tests.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "dbus/check-dbus-services.yaml"
}
]
@@ -148,12 +148,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "dbus/dbus-dos-reply-time.yaml"
}
]
@@ -166,12 +166,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/polkit-parsing.yaml"
}
]
@@ -184,12 +184,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/firewall.yaml"
}
]
@@ -202,12 +202,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/gettext-i18n.yaml"
}
]
@@ -220,12 +220,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/glib-gio-fs.yaml"
}
]
@@ -238,12 +238,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/grilo.yaml"
}
]
@@ -256,12 +256,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/gstreamer1-0-decode.yaml"
}
]
@@ -274,12 +274,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/gupnp-services.yaml"
}
]
@@ -292,12 +292,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/librest.yaml"
}
]
@@ -310,12 +310,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/libsoup.yaml"
}
]
@@ -328,12 +328,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/telepathy-gabble.yaml"
}
]
@@ -346,12 +346,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/tumbler-thumbnailing.yaml"
}
]
@@ -364,12 +364,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/v4l-automated.yaml"
}
]
diff --git a/templates/group-folks-tpl.json b/templates/group-folks-tpl.json
index 155b71b81e8164638836e8d62187735447a0f2c3..5bfff3f901033050acd6c4c0cb5d312e0f1de31b 100644
--- a/templates/group-folks-tpl.json
+++ b/templates/group-folks-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
@@ -48,47 +48,47 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/create-abstract-sync-database.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-alias-persistence.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-eds.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-extended-info.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-metacontacts.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-metacontacts-antilinking.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-search.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "folks/folks-telepathy.yaml"
}
]
diff --git a/templates/group-sdk-tpl.json b/templates/group-sdk-tpl.json
index 61741a510cc6ea265e5530aa64ffdc07aeeca658..9c13165c6ca687aee45a53a3a2e1a6e0651a7c65 100644
--- a/templates/group-sdk-tpl.json
+++ b/templates/group-sdk-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
@@ -48,42 +48,42 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/emulated-soft-keys.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/folks-sync-only.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/sdk-code-analysis-tools.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/sdk-debug-tools.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/sdk-performance-tools.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/telepathy-ring.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "sdk/x-out-of-screen-events-buttond.yaml"
}
]
diff --git a/templates/minimal-predeployed-1503-target-tpl.json b/templates/minimal-predeployed-1503-target-tpl.json
index f1f7d639ca9efd1474a4c0ddb862da05e2757a31..b65f676c822d645252c5ee0b20d3901457296479 100644
--- a/templates/minimal-predeployed-1503-target-tpl.json
+++ b/templates/minimal-predeployed-1503-target-tpl.json
@@ -24,12 +24,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
diff --git a/templates/minimal-tpl.json b/templates/minimal-tpl.json
index f003b1905e62a5591642640894b4734192fc63b6..ab3555778c32ce3f982a194a4bcd5a828c91fd92 100644
--- a/templates/minimal-tpl.json
+++ b/templates/minimal-tpl.json
@@ -23,12 +23,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
diff --git a/templates/sqlite-tpl.json b/templates/sqlite-tpl.json
index fdf310d5adcbc2286f71243e8b2a6c2823a51f82..28ff62945902d0914435a2aa5c01266c3f3728d4 100644
--- a/templates/sqlite-tpl.json
+++ b/templates/sqlite-tpl.json
@@ -30,12 +30,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "misc/add-repo.yaml"
}
]
@@ -48,12 +48,12 @@
"testdef_repos": [
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sanity-check.yaml"
},
{
"git-repo": "https://git.apertis.org/git/apertis-tests.git",
- "revision": "master",
+ "revision": "16.09",
"testdef": "common/sqlite.yaml"
}
]