diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-09 08:46:26 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-09 08:46:26 +0100 |
| commit | 6e3f93938ba20b3177988f8c0b9c224a9aa876a6 (patch) | |
| tree | 0e0259c34bc04d5916ac26d9d6b556d22fa62492 /bin | |
| parent | 4d3f5807cc2505d791c72ad88aef42abdfd4bebb (diff) | |
| download | jenkins.debian.net-6e3f93938ba20b3177988f8c0b9c224a9aa876a6.tar.xz | |
add new armhf node, Odroid-XU4, thanks to vagrant
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/common-functions.sh | 4 | ||||
| -rwxr-xr-x | bin/jenkins_master_wrapper.sh | 3 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 830316e3..660fe061 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -57,14 +57,14 @@ else if [ -z "$MIRROR" ]; then case $HOSTNAME in jenkins|profitbricks-build?-amd64) export MIRROR=http://ftp.de.debian.org/debian ;; - bpi0|cbxi4pro0|hb0|wbq0) export MIRROR=http://ftp.us.debian.org/debian ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4) 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" ;; - bpi0|cbxi4pro0|hb0|wbq0) export http_proxy="http://10.0.0.15:8000/" ;; + bpi0|cbxi4pro0|hb0|wbq0|odxu4) export http_proxy="http://10.0.0.15:8000/" ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac fi diff --git a/bin/jenkins_master_wrapper.sh b/bin/jenkins_master_wrapper.sh index b8d08e4c..e08e4da7 100755 --- a/bin/jenkins_master_wrapper.sh +++ b/bin/jenkins_master_wrapper.sh @@ -18,6 +18,9 @@ case "$NODE_NAME" in cbxi4pro0-armhf-rb.debian.net) PORT=2226 ;; + odxu4-armhf-rb.debian.net) + PORT=2229 + ;; profitbricks-build?-amd64.debian.net) PORT=22 if [[ "$JOB_NAME" =~ rebootstrap_.* ]] ; then diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 071a6576..babb8f21 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -46,7 +46,7 @@ SUITES="testing unstable experimental" ARCHS="armhf amd64" # define build nodes in use -BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net" # these also needs to be defined in bin/jenkins_master_wrapper.sh +BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-amd64.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net" # these also needs to be defined in bin/jenkins_master_wrapper.sh BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL1 KERNEL2" # these also needs to be defined in bin/reproducible_info.sh # existing usertags @@ -333,7 +333,9 @@ write_explaination_table() { write_page "<tr><td>env CAPTURE_ENVIRONMENT</td><td><em>not set</em></td><td>CAPTURE_ENVIRONMENT=\"I capture the environment\"</td></tr>" fi write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>" - if [ "$1" = "Arch Linux" ] ; then + if [ "$1" = "Debian" ] ; then + write_page "<tr><td>env LANG</td><td>LANG<em>C</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" + elif [ "$1" = "Arch Linux" ] ; then write_page "<tr><td>env LANG</td><td>LANG<em>not set</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" else write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" |