Merge lp:~canonical-platform-qa/qa-jenkins-jobs/proxy-optional into lp:qa-jenkins-jobs

[Max Brustkern]

Make https_proxy optional

Set https_proxy only if it isn't set, and push the file to the phone only if it isn't empty. (Technically, we may want to rewrite the file we push to the phone if it's set to something different, but that probably won't come up any time soon.)

Unmerged revisions

180. By Max Brustkern on 2016-09-19

Added comment

179. By Max Brustkern on 2016-09-19

'If https_proxy is set to , don't use a proxy

178. By Allan LeSage on 2016-09-16

1SS devices access the internet via https_proxy using upstart set-env.

Approved by Max Brustkern, platform-qa-bot.

=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh'
--- jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh	2016-09-16 20:33:25 +0000
+++ jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh	2016-09-19 18:53:36 +0000
@@ -22,16 +22,19 @@
 EOF
 cat $CONFIG_PATH
 
+# Use 1SS proxy unless it's otherwise defined
+export https_proxy=${https_proxy-https://squid.internal:3128/}
+
 # 1SS lab internet access via proxy
-adb -s $ANDROID_SERIAL push ./qa-jenkins-jobs/jobs/ubuntu-system-tests/https-proxy.conf /home/phablet/.config/upstart/https-proxy.conf
+if [ -n "$https_proxy" ] ; then
+    adb -s $ANDROID_SERIAL push ./qa-jenkins-jobs/jobs/ubuntu-system-tests/https-proxy.conf /home/phablet/.config/upstart/https-proxy.conf
+fi
 
 # let's work in a virtualenv
 rm -rf ve3
 virtualenv --system-site-packages --python=python3 ve3
 . ve3/bin/activate
 
-export https_proxy=https://squid.internal:3128/
-
 rm -rf ubuntu-system-tests
 bzr branch $UBUNTU_SYSTEM_TESTS_BRANCH ubuntu-system-tests
 cd ubuntu-system-tests