Merge lp:~sinzui/juju-ci-tools/more-agents into lp:juju-ci-tools

[Curtis Hovey]

Include centos and win agents in the testing streams.

This branch adds a rule to retrieve the agents from lastBuild of build-centos and build-win-agent. The test maas has win2012r2 images, the win2012 agent is copied to the extra name. This copy is analogous to the 'cp' we use in s3 to create all win agents for a juju version based on win2012.

Once I complete a remote workspace runner to build ppc64el packages, I can dismantle the publish-revision script to create 3 jobs: build-source-packages, build-binary-packages, and publish-revision (which will depend on build-binary-packages, built-centos, and build-win-agent)

[Aaron Bentley (abentley)]

Looks good.

review: Approve

=== modified file 'publish-revision'
--- publish-revision	2015-03-17 17:22:29 +0000
+++ publish-revision	2015-05-27 18:03:35 +0000
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eux
 
+: ${SCRIPTS=$(readlink -f $(dirname $0))}
 BUILD_PACKAGES=${BUILD_PACKAGES:-true}
 BUILD_i386=${BUILD_i386:-true}
 TARFILE=$($SCRIPTS/jujuci.py get build-revision 'juju-core_*.tar.gz' ./)
@@ -80,6 +81,17 @@
 done
 fi
 
+# These agents are built while the debs are built. This is safe to do because
+# the debs take 45 minutes. When this script is dismantled, the job
+# that publishes the revision will require build-centos, build-win-agen,
+and the new build-packages job.
+$SCRIPTS/jujuci.py get -b lastBuild \
+    build-centos juju-*centos7-amd64.tgz $WORKSPACE
+WIN2012=$($SCRIPTS/jujuci.py get -b lastBuild \
+    build-win-agent juju-*win2012-amd64.tgz $WORKSPACE)
+WIN2012R2=$(echo $WIN2012 | sed -e 's,win2012-,win2012r2-,')
+cp $WIN2012 $WIN2012R2
+
 $RELEASE_TOOLS/assemble-streams.bash -n -t $WORKSPACE/ testing $VERSION $STREAMS
 PUBLISH_ARGS="testing $STREAMS/juju-dist cpc"
 $RELEASE_TOOLS/publish-public-tools.bash $PUBLISH_ARGS || \