[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: force http_proxy as we want it

[Holger Levsen]

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


Commits:
fbbde113 by Holger Levsen at 2018-11-12T18:48:36Z
reproducible: force http_proxy as we want it

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

- - - - -


1 changed file:

- bin/common-functions.sh


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -137,27 +137,26 @@ else
 				echo "unsupported host, exiting." ; exit 1 ;;
 		esac
 	fi
-	if [ -z "$http_proxy" ]; then
-		case $HOSTNAME in
-			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*)
-				export http_proxy="http://10.0.0.15:8000/" ;;
-			spectrum)
-				export MIRROR=none ;;
-			*)
-				echo "unsupported host, exiting." ; exit 1 ;;
-		esac
-	fi
+	# force http_proxy as we want it
+	case $HOSTNAME in
+		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*)
+			export http_proxy="http://10.0.0.15:8000/" ;;
+		spectrum)
+			export MIRROR=none ;;
+		*)
+			echo "unsupported host, exiting." ; exit 1 ;;
+	esac
 	if [ -z "$CHROOT_BASE" ]; then
 		export CHROOT_BASE=/chroots
 	fi



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/fbbde11398e8d4a3e1d33cab25b1102bd9be4132

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/fbbde11398e8d4a3e1d33cab25b1102bd9be4132
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/fd9818c9/attachment-0001.html>