← Back to branch summary

~aurelien-lourot/ubuntu-openstack-ci/ironic

« back to all changes in this revision

Viewing changes to run/job-parts/osci_job_common.sh

  • Committer: Liam Young
  • Date: 2020-06-16 11:16:19 UTC
  • mfrom: (430.1.1 ubuntu-openstack-ci)
  • Revision ID: liam.young@canonical.com-20200616111619-k41q9vp0ib2cd6y4
[gnuoy, r=chris.macnaughton] A recent change to z-o-t switched proxy env variable

A recent change to zaza-openstack-tests switched the tests from using
OS_TEST_HTTP_PROXY to TEST_HTTP_PROXY *1. This has caused some failures *2
as osci is still using the old variablr.

*1 https://github.com/openstack-charmers/zaza-openstack-tests/commit/1a784f5b049fc996b2f0cf584d983d002df1a000
*2 https://review.opendev.org/#/c/735106/

Show diffs side-by-side

added added

removed removed

Lines of Context:
run/job-parts/osci_job_common.sh
336
336
 
337
337
function f_proxy_if_proxy() {
338
338
# Set http proxy if already set for functional tests
339
 
  if [[ -n "$OS_TEST_HTTP_PROXY" ]]; then
 
339
  if [[ -n "$TEST_HTTP_PROXY" ]]; then
340
340
    export NO_PROXY=$OSCI_NO_PROXY
341
 
    export HTTP_PROXY=$OS_TEST_HTTP_PROXY
342
 
    export HTTPS_PROXY=$(echo $OS_TEST_HTTP_PROXY | sed 's/http/https/g')
 
341
    export HTTP_PROXY=$TEST_HTTP_PROXY
 
342
    export HTTPS_PROXY=$(echo $TEST_HTTP_PROXY | sed 's/http/https/g')
343
343
    export http_proxy=$HTTP_PROXY
344
344
    export https_proxy=$HTTPS_PROXY
345
345
    echo " + Enabling HTTP(S) proxies."