ubuntu-openstack-ci

Merge lp:~gnuoy/ubuntu-openstack-ci/fix-proxy-var into lp:ubuntu-openstack-ci

  1. fix-proxy-var
  2. Merge into trunk
Proposed by Liam Young
Status: Merged
Merged at revision: 431
Proposed branch: lp:~gnuoy/ubuntu-openstack-ci/fix-proxy-var
Merge into: lp:ubuntu-openstack-ci
Diff against target: 51 lines (+7/-3)
4 files modified
deploy/assets/bashrc (+1/-0)
deploy/assets/config.xml.global (+2/-0)
deploy/templates/oscirc (+1/-0)
run/job-parts/osci_job_common.sh (+3/-3)
To merge this branch: bzr merge lp:~gnuoy/ubuntu-openstack-ci/fix-proxy-var
Reviewer Review Type Date Requested Status
Chris MacNaughton (community) Approve
Review via email: mp+385806@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deploy/assets/bashrc'
2--- deploy/assets/bashrc 2019-08-29 17:27:11 +0000
3+++ deploy/assets/bashrc 2020-06-16 11:09:47 +0000
4@@ -118,3 +118,4 @@
5
6 export AMULET_HTTP_PROXY='http://squid.internal:3128'
7 export OS_TEST_HTTP_PROXY='http://squid.internal:3128'
8+export TEST_HTTP_PROXY='http://squid.internal:3128'
9
10=== modified file 'deploy/assets/config.xml.global'
11--- deploy/assets/config.xml.global 2019-08-29 17:27:11 +0000
12+++ deploy/assets/config.xml.global 2020-06-16 11:09:47 +0000
13@@ -11,6 +11,8 @@
14 <string>http://squid.internal:3128/</string>
15 <string>OS_TEST_HTTP_PROXY</string>
16 <string>http://squid.internal:3128/</string>
17+ <string>TEST_HTTP_PROXY</string>
18+ <string>http://squid.internal:3128/</string>
19 <string>DEBEMAIL</string>
20 <string>openstack-testing-bot@ubuntu.com</string>
21 <string>DEBFULLNAME</string>
22
23=== modified file 'deploy/templates/oscirc'
24--- deploy/templates/oscirc 2019-08-29 17:27:11 +0000
25+++ deploy/templates/oscirc 2020-06-16 11:09:47 +0000
26@@ -6,6 +6,7 @@
27
28 export AMULET_HTTP_PROXY="http://squid.internal:3128/"
29 export OS_TEST_HTTP_PROXY="http://squid.internal:3128/"
30+export TEST_HTTP_PROXY="http://squid.internal:3128/"
31 export BAK_REMOTE_BASE_DIR="/home/ubuntu/osci/bak-osci-master"
32 export BAK_USER_HOST="ubuntu@10.245.168.2"
33 export OSCI_MASTER_IP="10.245.162.49"
34
35=== modified file 'run/job-parts/osci_job_common.sh'
36--- run/job-parts/osci_job_common.sh 2020-02-04 07:06:20 +0000
37+++ run/job-parts/osci_job_common.sh 2020-06-16 11:09:47 +0000
38@@ -336,10 +336,10 @@
39
40 function f_proxy_if_proxy() {
41 # Set http proxy if already set for functional tests
42- if [[ -n "$OS_TEST_HTTP_PROXY" ]]; then
43+ if [[ -n "$TEST_HTTP_PROXY" ]]; then
44 export NO_PROXY=$OSCI_NO_PROXY
45- export HTTP_PROXY=$OS_TEST_HTTP_PROXY
46- export HTTPS_PROXY=$(echo $OS_TEST_HTTP_PROXY | sed 's/http/https/g')
47+ export HTTP_PROXY=$TEST_HTTP_PROXY
48+ export HTTPS_PROXY=$(echo $TEST_HTTP_PROXY | sed 's/http/https/g')
49 export http_proxy=$HTTP_PROXY
50 export https_proxy=$HTTPS_PROXY
51 echo " + Enabling HTTP(S) proxies."

Subscribers

People subscribed via source and target branches