Merge lp:~abentley/juju-ci-tools/s3-download into lp:juju-ci-tools

[Aaron Bentley]

Download mac os tarball from S3.

This branch tweaks run-osx-client* to use s3 as the source for the initial tarball.

It moves download responsibility to run-os-client.bash, because the target machine doesn't have s3cmd installed.

It changes the base environment to testing-osx-client-base and the temporary environment to testing-osx-client1 to avoid conflicts with other jobs that might use the testing-osx-client environment.

It stops running setup-workspace because that will delete the uploaded files. With "jujuci.py get" already gone, there's no need to source juju-qa.jujuci.

Similarly, JUJU_HOME was not used, and was not exported, so it wasn't needed.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'run-osx-client-remote.bash'
--- run-osx-client-remote.bash	2015-07-09 19:38:56 +0000
+++ run-osx-client-remote.bash	2015-07-10 19:14:19 +0000
@@ -2,16 +2,13 @@
 set -eu
 export PATH=$HOME/juju-ci-tools:$PATH
 WORKSPACE=$(pwd)
-JUJU_HOME=$HOME/.juju
+TARFILE=$1
 source $HOME/.bashrc
-source $HOME/cloud-city/juju-qa.jujuci
 set -x
 
-jujuci.py setup-workspace --clean-env testing-osx-client $WORKSPACE
-~/Bin/juju destroy-environment --force -y testing-osx-client || true
-TARFILE=$(jujuci.py get build-osx-client 'juju-*-osx.tar.gz' ./)
-echo "Downloaded $TARFILE"
-tar -xf ./$TARFILE -C $WORKSPACE
-
-deploy_job.py testing-osx-client artifacts testing-osx-client \
+env=testing-osx-client1
+~/Bin/juju destroy-environment --force -y $env || true
+tar -xf $TARFILE -C $WORKSPACE
+mkdir artifacts
+deploy_job.py testing-osx-client-base artifacts $env \
   --new-juju-bin $WORKSPACE/juju-bin

=== modified file 'run-osx-client.bash'
--- run-osx-client.bash	2015-07-09 20:58:51 +0000
+++ run-osx-client.bash	2015-07-10 19:14:19 +0000
@@ -16,11 +16,21 @@
 
 set -x
 $SCRIPTS/jujuci.py get-build-vars --summary $revision_build
+if [ -d built ]; then
+  rm -R built
+fi
+mkdir built
+s3cmd -c $JUJU_HOME/juju-qa.s3cfg sync \
+  s3://juju-qa-data/juju-ci/products/version-$revision_build/build-osx-client/\
+  built --exclude '*' --include 'juju-*-osx.tar.gz'
+TARFILE=$(find  built -name 'juju-*-osx.tar.gz')
+echo "Downloaded $TARFILE"
 
 cat > temp-config.yaml <<EOT
 install:
   remote:
     - $SCRIPTS/run-osx-client-remote.bash
-command: [remote/run-osx-client-remote.bash]
+    - "$TARFILE"
+command: [remote/run-osx-client-remote.bash, "remote/$(basename $TARFILE)"]
 EOT
 workspace-run temp-config.yaml $USER_AT_HOST