Merge lp:~fginther/pbuilderjenkins/add-proposed-hook into lp:pbuilderjenkins

[Francis Ginther]

Add a hook script for adding the proposed pocket.

Add a hook script for adding the proposed pocket.

This was tested as a stand-alone hook here:
* http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-xenial-armhf-ci-fjg/1/consoleText
* http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-xenial-amd64-ci-fjg/2/consoleText

In both jobs, you can observer that some of the dependencies were satisfied by packages in 'xenial-proposed'.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/pbuilderjenkins-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pbuilderjenkins-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pbuilderjenkins-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pbuilderjenkins-ci/60/rebuild

review: Approve (continuous-integration)

[Para Siva (psivaa)]

This looks good to me. Just curious about the fact that this enables -proposed for all the archives. i.e. main, universe, restricted and multiverse. I also see another hook to enable universe, D09add_universe, although I dont see it as being in any of the configs in cupstream2distro.
Won't there be any other dependency issues when this D09add_proposed hook being used without the other?

review: Needs Information

[Francis Ginther (fginther)]

Psivaa, that's a valid point. This does assume that all these archives are intended to be enabled. But using all of these archives is how we've been setting up our chroots [1] in CI and recommending to others [2].

The fact that there is also a D09add_universe hook is a bit misleading. The CI build environment was more restrictive at one time, which is why it exists. For our current environment, it's now obsolete. If it comes up that some user needs a more restrictive version of this hook, they can use this as a template for building exactly what they need.

[1] - http://s-jenkins.ubuntu-ci:8080/job/create-debian-chroot/configure
[2] - https://wiki.canonical.com/InformationInfrastructure/Jenkaas/ExampleJobsDebian#Creating_the_debian_chroots

[Para Siva (psivaa)]

Thanks Francis, for the explanation. That makes sense. Since we have old and new documentation recommending all the archives, this should not confuse the users.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-28 20:03:22 +0000
+++ debian/changelog	2015-12-21 20:06:42 +0000
@@ -1,3 +1,9 @@
+pbuilderjenkins (0.48) xenial; urgency=medium
+
+  * Add hook, D09add_proposed, for adding the proposed pocket. 
+
+ -- Francis Ginther <[e-mail]>  Mon, 21 Dec 2015 14:04:44 -0600
+
 pbuilderjenkins (0.47) wily; urgency=medium
 
   * Support handling of multiple coverage xml files for cobertura.

=== added file 'hooks/D09add_proposed'
--- hooks/D09add_proposed	1970-01-01 00:00:00 +0000
+++ hooks/D09add_proposed	2015-12-21 20:06:42 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+. /etc/lsb-release
+
+ARCH=$(dpkg --print-architecture)
+if [ $ARCH == 'armhf' ]; then
+    ARCHIVE_SOURCE=http://ports.ubuntu.com/ubuntu-ports/
+else
+    ARCHIVE_SOURCE=http://archive.ubuntu.com/ubuntu/
+fi
+
+echo deb ${ARCHIVE_SOURCE} ${DISTRIB_CODENAME}-proposed main restricted universe multiverse >> /etc/apt/sources.list