Merge lp:~abentley/juju-ci-tools/skip-hammer-time into lp:juju-ci-tools

[Aaron Bentley]

Skip hammer-time where not supported.

This branch prevents hammer-time being downloaded when it would fail.

It blacklists the specific hosts that don't have network connectivity to github. It also prevents downloads on trusty and precise.

[Curtis Hovey (sinzui)]

I have a question about detecting github access.

review: Needs Information (code)

[Aaron Bentley (abentley)]

Reply below.

[lp:~abentley/juju-ci-tools/skip-hammer-time]

1967. By Aaron Bentley on 2017-04-03

Merged trunk into skip-hammer-time.

1968. By Aaron Bentley on 2017-04-03

Detect github access instead of using a hardcoded list.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'update-jenkins-slave.bash'
--- update-jenkins-slave.bash	2017-03-28 20:45:57 +0000
+++ update-jenkins-slave.bash	2017-04-03 14:44:48 +0000
@@ -51,12 +51,24 @@
 
 echo "Updating branches"
 OS=$(get_os)
+if [[ $OS != "ubuntu" ]]; then
+    hammer_time="disabled"
+# Does not support python3-venv
+elif (lsb_release -c|grep -E 'trusty|precise'); then
+    hammer_time="disabled"
+# Check network access to github
+elif (netcat github.com 22 -w 1 > /dev/null < /dev/null); then
+    hammer_time="enabled"
+else
+    hammer_time="disabled"
+fi
+
 update_branch lp:workspace-runner
 update_branch lp:juju-release-tools
 update_branch lp:juju-ci-tools
 update_branch lp:juju-ci-tools/repository
 update_branch lp:~juju-qa/+junk/cloud-city
-if [[ $OS == "ubuntu" ]]; then
+if [[ $hammer_time == "enabled" ]]; then
     sudo apt-get install git -y
     update_git_repo [e-mail]:juju/hammer-time.git
 fi
@@ -71,11 +83,11 @@
 if [[ $OS == "ubuntu" ]]; then
     make -C $HOME/juju-ci-tools install-deps
     make -C $HOME/workspace-runner install
-    if (lsb_release -c|grep -v -E 'trusty|precise'); then
-        make -C $HOME/hammer-time develop
-    fi
 elif [[ $OS == "darwin" ]]; then
     $HOME/juju-ci-tools/pipdeps.py install
 fi
+if [[ $hammer_time == "enabled" ]]; then
+    make -C $HOME/hammer-time develop
+fi
 
 echo "$HOSTNAME update complete"