diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-01-02 12:58:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-18 18:14:41 +0000 |
| commit | fb55d5bc14af9dd1f3cc903a00e93f1db53bf149 (patch) | |
| tree | a2d73af96c450b35a7c45a4df1121b49a5f3a090 /coin/provisioning/common/unix | |
| parent | 41c372c010ad830ddc9d87cd09ac250196fbab18 (diff) | |
Set proxy on Windows VMs while provisioning
Task-number: QTQAINFRA-1669
Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 54d8396d681c97ace18e2710394b8b34fa8f0411)
Diffstat (limited to 'coin/provisioning/common/unix')
| -rwxr-xr-x | coin/provisioning/common/unix/check_and_set_proxy.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/unix/http_proxy.txt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 8dad878c..38905d56 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -33,7 +33,7 @@ ############################################################################# source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/http_proxy.txt" +source "${BASH_SOURCE%/*}/../http_proxy.txt" try ( diff --git a/coin/provisioning/common/unix/http_proxy.txt b/coin/provisioning/common/unix/http_proxy.txt deleted file mode 100644 index 3aa6ceba..00000000 --- a/coin/provisioning/common/unix/http_proxy.txt +++ /dev/null @@ -1,2 +0,0 @@ -proxy="http://proxy.intra.qt.io:3128" - |