diff options
| author | Philip Hands <phil@hands.com> | 2015-12-11 18:22:15 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-11 19:13:46 +0100 |
| commit | 04ed7b1fdd54f87fb6a1bf4d1138200e5ee5b3ed (patch) | |
| tree | c53d2f6ace598e44bf80eaaf779ebd14a38ab59f /bin/common-functions.sh | |
| parent | 1b168621c6a942fa88769b255133dc017c454833 (diff) | |
| download | jenkins.debian.net-04ed7b1fdd54f87fb6a1bf4d1138200e5ee5b3ed.tar.xz | |
let jenkins-test-vm do some work (modified by h01ger)
Diffstat (limited to 'bin/common-functions.sh')
| -rwxr-xr-x | bin/common-functions.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 1f2715e7..b79c5381 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -18,10 +18,6 @@ common_cleanup() { common_init() { # check whether this script has been started from /tmp already if [ "${0:0:5}" != "/tmp/" ] ; then - if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then - echo "$(date -u) - running on $HOSTNAME, exiting successfully and cleanly immediatly." - exit 0 - fi # check that we are not root if [ $(id -u) -eq 0 ] ; then echo "Do not run this as root." @@ -60,14 +56,14 @@ else fi if [ -z "$MIRROR" ]; then case $HOSTNAME in - jenkins|profitbricks-build?-amd64) export MIRROR=http://ftp.de.debian.org/debian ;; + jenkins|jenkins-test-vm|profitbricks-build?-amd64) export MIRROR=http://ftp.de.debian.org/debian ;; bpi0|cbxi4pro0|hb0|wbq0|odxu4|wbd0|rpi2b) export MIRROR=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac fi if [ -z "$http_proxy" ]; then case $HOSTNAME in - jenkins|profitbricks-build?-amd64) export http_proxy="http://localhost:3128" ;; + jenkins|jenkins-test-vm|profitbricks-build?-amd64) export http_proxy="http://localhost:3128" ;; bpi0|cbxi4pro0|hb0|wbq0|odxu4|wbd0|rpi2b) export http_proxy="http://10.0.0.15:8000/" ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac |