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

Proposed by Allan LeSage
Status: Merged
Approved by: Max Brustkern
Approved revision: 184
Merged at revision: 178
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/ust-https-proxy
Merge into: lp:qa-jenkins-jobs
Diff against target: 25 lines (+10/-0)
2 files modified
jobs/ubuntu-system-tests/https-proxy.conf (+7/-0)
jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh (+3/-0)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/ust-https-proxy
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
platform-qa-bot continuous-integration Approve
Review via email: mp+306009@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Let's get that internet!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'jobs/ubuntu-system-tests/https-proxy.conf'
2--- jobs/ubuntu-system-tests/https-proxy.conf 1970-01-01 00:00:00 +0000
3+++ jobs/ubuntu-system-tests/https-proxy.conf 2016-09-16 20:38:55 +0000
4@@ -0,0 +1,7 @@
5+
6+start on starting dbus
7+
8+script
9+ initctl set-env --global https_proxy=http://squid.internal:3128
10+ initctl set-env --global http_proxy=http://squid.internal:3128
11+end script
12
13=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh'
14--- jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh 2016-08-25 21:13:31 +0000
15+++ jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh 2016-09-16 20:38:55 +0000
16@@ -22,6 +22,9 @@
17 EOF
18 cat $CONFIG_PATH
19
20+# 1SS lab internet access via proxy
21+adb -s $ANDROID_SERIAL push ./qa-jenkins-jobs/jobs/ubuntu-system-tests/https-proxy.conf /home/phablet/.config/upstart/https-proxy.conf
22+
23 # let's work in a virtualenv
24 rm -rf ve3
25 virtualenv --system-site-packages --python=python3 ve3

Subscribers

People subscribed via source and target branches