[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible: make all pb nodes in karlsruhe use pb1 as proxy and all nodes in…

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
9bd61594 by Holger Levsen at 2018-11-12T16:17:50Z
reproducible: make all pb nodes in karlsruhe use pb1 as proxy and all nodes in frankfurt use pb10 as proxy

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
d34a6008 by Holger Levsen at 2018-11-12T16:20:38Z
reproducible: drop unused squid configs

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
f923a9d1 by Holger Levsen at 2018-11-12T16:23:18Z
reproducible: let pb7 use its own proxy for the fdroid stuff

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


22 changed files:

- bin/common-functions.sh
- − hosts/common-amd64/etc/squid/squid.conf
- − hosts/common-arm64/etc/squid/squid.conf
- − hosts/common-i386/etc/squid/squid.conf
- + hosts/jenkins-test-vm/etc/apt/apt.conf.d/80proxy
- + hosts/jenkins/etc/apt/apt.conf.d/80proxy
- − hosts/jenkins/etc/squid/squid.conf
- + hosts/profitbricks-build1-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build10-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build11-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build12-i386/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build15-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build16-i386/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build2-i386/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/profitbricks-build3-amd64/etc/squid/squid.conf
- + hosts/profitbricks-build4-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/profitbricks-build4-amd64/etc/squid/squid.conf
- + hosts/profitbricks-build5-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build6-i386/etc/apt/apt.conf.d/80proxy
- hosts/common/etc/apt/apt.conf.d/80proxy → hosts/profitbricks-build7-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build9-amd64/etc/apt/apt.conf.d/80proxy


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -139,8 +139,15 @@ else
 	fi
 	if [ -z "$http_proxy" ]; then
 		case $HOSTNAME in
-			jenkins|jenkins-test-vm|profitbricks-build*)
-				export http_proxy="http://localhost:3128" ;;
+			jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build3*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)
+				# pb datacenter in karlsruhe uses pb1 as proxy:
+				export http_proxy="http://78.137.99.97:3128" ;;
+			profitbricks-build4*|profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
+				# pb datacenter in frankfurt uses pb10 as proxy:
+				export http_proxy="http://85.184.249.68:3128" ;;
+			profitbricks-build7*)
+				# let pb7 use its own proxy for the fdroid stuff:
+				export http_proxy="http://127.0.0.1:3128" ;;
 			codethink*)
 				export http_proxy="http://192.168.101.16:3128" ;;
 			bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)


=====================================
hosts/common-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/common-arm64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/common-i386/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/jenkins-test-vm/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/jenkins/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/jenkins/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/profitbricks-build1-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/profitbricks-build10-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/profitbricks-build11-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/profitbricks-build12-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/profitbricks-build15-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/profitbricks-build16-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/profitbricks-build2-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";


=====================================
hosts/profitbricks-build3-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/profitbricks-build4-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/profitbricks-build4-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/profitbricks-build5-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/profitbricks-build6-i386/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";


=====================================
hosts/common/etc/apt/apt.conf.d/80proxy → hosts/profitbricks-build7-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1,2 +1 @@
 Acquire::http::Proxy "http://127.0.0.1:3128/";
-


=====================================
hosts/profitbricks-build9-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://78.137.99.97:3128/";



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/f8fe604d233dabdae3b7100b5b74b28bf86a0305...f923a9d1b2a7641db8eb7fc645cfcb6979cbd4e8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/f8fe604d233dabdae3b7100b5b74b28bf86a0305...f923a9d1b2a7641db8eb7fc645cfcb6979cbd4e8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181112/6f716903/attachment-0001.html>