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

Proposed by Max Brustkern
Status: Work in progress
Proposed branch: lp://staging/~canonical-platform-qa/qa-jenkins-jobs/proxy-optional
Merge into: lp://staging/qa-jenkins-jobs
Diff against target: 26 lines (+6/-3)
1 file modified
jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh (+6/-3)
To merge this branch: bzr merge lp://staging/~canonical-platform-qa/qa-jenkins-jobs/proxy-optional
Reviewer Review Type Date Requested Status
Canonical Platform QA Jenkins Pending
Review via email: mp+306140@code.staging.launchpad.net

Commit message

Make https_proxy optional

Description of the change

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.)

To post a comment you must log in.

Unmerged revisions

180. By Max Brustkern

Added comment

179. By Max Brustkern

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

178. By Allan LeSage

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

Approved by Max Brustkern, platform-qa-bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches