diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-09-19 15:08:50 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-09-19 15:09:18 +0200 |
| commit | 39421cde89372babc21c5813b68de9579a0409c7 (patch) | |
| tree | ff22f7665673853d44562cf19968f2ea268d3c33 | |
| parent | 33537327617bce60a0d6fcd724316f771422ffe7 (diff) | |
| download | jenkins.debian.net-39421cde89372babc21c5813b68de9579a0409c7.tar.xz | |
reproducible Debian armhf: replace opi2a with jtk1a, except for builder jobs
82 files changed, 101 insertions, 106 deletions
@@ -141,7 +141,7 @@ Installation tests inside chroot environments. ** To test 'armhf' we are using 21 small boards donated by vagrant@d.o: *** five quad-cores (cbxi4a, cbxi4b, and ff4a) with 4gb ram, *** three octo-cores (odxu4, odxu4b and odxu4c) with 2gb ram, -*** eight quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2a, opi2b, and opi2c) with 2gb ram, +*** eight quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2b, opi2c and jtk1a) with 2gb ram, *** two dual-core (bbx15 and cb3a) with 2gb ram and, *** two quad-cores (rpi2b and rpi2c) with 1gb ram and *** three dual-cores (bpi0, hb0 and wbd0) with 1gb ram, each. diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 4bc4f477..e62d3d9d 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -58,7 +58,7 @@ else case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) export MIRROR=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) export MIRROR=http://ftp.us.debian.org/debian ;; spectrum) export MIRROR=none ;; @@ -70,7 +70,7 @@ else case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) export http_proxy="http://localhost:3128" ;; - bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) export http_proxy="http://10.0.0.15:8000/" ;; spectrum) export MIRROR=none ;; diff --git a/bin/jenkins_node_definitions.sh b/bin/jenkins_node_definitions.sh index 0f645c5d..7bb985b6 100755 --- a/bin/jenkins_node_definitions.sh +++ b/bin/jenkins_node_definitions.sh @@ -4,7 +4,7 @@ # released under the GPLv=2 # define Debian build nodes in use -BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net wbq0-armhf-rb.debian.net cb3a-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odu3a-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net" +BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net wbq0-armhf-rb.debian.net cb3a-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odu3a-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net" # return the ports sshd is listening on get_node_ssh_port() { @@ -58,9 +58,6 @@ get_node_ssh_port() { ff4a-armhf-rb.debian.net) PORT=2241 ;; - opi2a-armhf-rb.debian.net) - PORT=2236 - ;; opi2b-armhf-rb.debian.net) PORT=2238 ;; @@ -73,6 +70,9 @@ get_node_ssh_port() { opi2c-armhf-rb.debian.net) PORT=2245 ;; + jtk1a-armhf-rb.debian.net) + PORT=2246 + ;; profitbricks-build*) PORT=22 ;; diff --git a/deploy_everywhere b/deploy_everywhere index 8e94b2c5..08f5aaeb 100755 --- a/deploy_everywhere +++ b/deploy_everywhere @@ -25,7 +25,7 @@ START=$(date +'%s') GIT_REPO="git://anonscm.debian.org/qa/jenkins.debian.net.git" -export HOSTS="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net root@jenkins.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net odu3a-armhf-rb.debian.net cb3a-armhf-rb.debian.net opi2c-armhf-rb.debian.net" +export HOSTS="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net root@jenkins.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net opi2b-armhf-rb.debian.net odu3a-armhf-rb.debian.net cb3a-armhf-rb.debian.net opi2c-armhf-rb.debian.net jtk1a-armhf-rb.debian.net" echo echo -n "$(date) - " # real command, for running manually: cd ~jenkins-adm/jenkins.debian.net/ ; sudo -u jenkins-adm git pull ; ./update_jdn.sh diff --git a/hosts/bbx15-armhf-rb/etc/pbuilderrc b/hosts/bbx15-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/bbx15-armhf-rb/etc/pbuilderrc +++ b/hosts/bbx15-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/bbx15-armhf-rb/etc/postfix/main.cf b/hosts/bbx15-armhf-rb/etc/postfix/main.cf index 7737c9ba..bd6a830e 100644 --- a/hosts/bbx15-armhf-rb/etc/postfix/main.cf +++ b/hosts/bbx15-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = bbx15-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/bpi0-armhf-rb/etc/pbuilderrc +++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/bpi0-armhf-rb/etc/postfix/main.cf b/hosts/bpi0-armhf-rb/etc/postfix/main.cf index b26c4805..d88bb51b 100644 --- a/hosts/bpi0-armhf-rb/etc/postfix/main.cf +++ b/hosts/bpi0-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = bpi0-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/cb3a-armhf-rb/etc/pbuilderrc b/hosts/cb3a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/cb3a-armhf-rb/etc/pbuilderrc +++ b/hosts/cb3a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/cb3a-armhf-rb/etc/postfix/main.cf b/hosts/cb3a-armhf-rb/etc/postfix/main.cf index 1ec3f769..922b4c4f 100644 --- a/hosts/cb3a-armhf-rb/etc/postfix/main.cf +++ b/hosts/cb3a-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = cb3a-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf index e560b972..a6f291c7 100644 --- a/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf +++ b/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = cbxi4a-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf index 7301de06..a83aefc5 100644 --- a/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf +++ b/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = cbxi4b-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf index 4cac5323..7c48ece1 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf +++ b/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = cbxi4pro0-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/ff2a-armhf-rb/etc/pbuilderrc b/hosts/ff2a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/ff2a-armhf-rb/etc/pbuilderrc +++ b/hosts/ff2a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/ff2a-armhf-rb/etc/postfix/main.cf b/hosts/ff2a-armhf-rb/etc/postfix/main.cf index 057a0e88..74d3de66 100644 --- a/hosts/ff2a-armhf-rb/etc/postfix/main.cf +++ b/hosts/ff2a-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = ff2a-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/ff2b-armhf-rb/etc/pbuilderrc b/hosts/ff2b-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/ff2b-armhf-rb/etc/pbuilderrc +++ b/hosts/ff2b-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/ff2b-armhf-rb/etc/postfix/main.cf b/hosts/ff2b-armhf-rb/etc/postfix/main.cf index 5730e488..db8114bd 100644 --- a/hosts/ff2b-armhf-rb/etc/postfix/main.cf +++ b/hosts/ff2b-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = ff2b-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/ff4a-armhf-rb/etc/pbuilderrc b/hosts/ff4a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/ff4a-armhf-rb/etc/pbuilderrc +++ b/hosts/ff4a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/ff4a-armhf-rb/etc/postfix/main.cf b/hosts/ff4a-armhf-rb/etc/postfix/main.cf index fbb83a40..24fe1b78 100644 --- a/hosts/ff4a-armhf-rb/etc/postfix/main.cf +++ b/hosts/ff4a-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = ff4a-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/hb0-armhf-rb/etc/pbuilderrc +++ b/hosts/hb0-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/hb0-armhf-rb/etc/postfix/main.cf b/hosts/hb0-armhf-rb/etc/postfix/main.cf index c7085cf0..c7e13690 100644 --- a/hosts/hb0-armhf-rb/etc/postfix/main.cf +++ b/hosts/hb0-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = hb0-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/jenkins-test-vm/etc/pbuilderrc b/hosts/jenkins-test-vm/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/jenkins-test-vm/etc/pbuilderrc +++ b/hosts/jenkins-test-vm/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index 83810e47..4a6374bf 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -354,8 +354,8 @@ contact.me.command mail -s "Munin notification ${var:host}" root diskstats_utilization.graph no diskstats_iops.graph no -[opi2a-armhf-rb.debian.net] - address ssh://jenkins@opi2a-armhf-rb.debian.net:2236/bin/nc localhost 4949 +[jtk1a-armhf-rb.debian.net] + address ssh://jenkins@jtk1a-armhf-rb.debian.net:2246/bin/nc localhost 4949 use_node_name yes diskstats_latency.sda.avgwrwait.warning 0:20 diskstats_latency.sda.avgrdwait.warning 0:10 @@ -497,5 +497,5 @@ contact.me.command mail -s "Munin notification ${var:host}" root # node_order Totals fii.foo.com fay.foo.com # [debian.net;] - node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net wbd0-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net + node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net hb0-armhf-rb.debian.net odxu4-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net wbd0-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/jenkins/etc/pbuilderrc +++ b/hosts/jenkins/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/jtk1a b/hosts/jtk1a new file mode 120000 index 00000000..cdc70365 --- /dev/null +++ b/hosts/jtk1a @@ -0,0 +1 @@ +jtk1a-armhf-rb/
\ No newline at end of file diff --git a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions index 2318f84e..2318f84e 100644 --- a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions +++ b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions diff --git a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/80proxy b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/80proxy index 9e738254..9e738254 100644 --- a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/80proxy +++ b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/80proxy diff --git a/hosts/opi2a-armhf-rb/etc/apt/listchanges.conf b/hosts/jtk1a-armhf-rb/etc/apt/listchanges.conf index 8b598c0a..8b598c0a 100644 --- a/hosts/opi2a-armhf-rb/etc/apt/listchanges.conf +++ b/hosts/jtk1a-armhf-rb/etc/apt/listchanges.conf diff --git a/hosts/opi2a-armhf-rb/etc/apt/sources.list b/hosts/jtk1a-armhf-rb/etc/apt/sources.list index 70669281..70669281 100644 --- a/hosts/opi2a-armhf-rb/etc/apt/sources.list +++ b/hosts/jtk1a-armhf-rb/etc/apt/sources.list diff --git a/hosts/opi2a-armhf-rb/etc/cron.d/dsa b/hosts/jtk1a-armhf-rb/etc/cron.d/dsa index 9be64c36..9be64c36 100755 --- a/hosts/opi2a-armhf-rb/etc/cron.d/dsa +++ b/hosts/jtk1a-armhf-rb/etc/cron.d/dsa diff --git a/hosts/opi2a-armhf-rb/etc/munin/munin-node.conf b/hosts/jtk1a-armhf-rb/etc/munin/munin-node.conf index 65ba8e0f..76c4ef2e 100644 --- a/hosts/opi2a-armhf-rb/etc/munin/munin-node.conf +++ b/hosts/jtk1a-armhf-rb/etc/munin/munin-node.conf @@ -63,4 +63,4 @@ host * port 4949 allow ^78\.137\.96\.196 -hostname opi2a-armhf-rb.debian.net +hostname jtk1a-armhf-rb.debian.net diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/df b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/df index b3fdadcb..b3fdadcb 100644 --- a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/df +++ b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/df diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/diskstats b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/diskstats index 2d11f397..2d11f397 100644 --- a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/diskstats +++ b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/diskstats diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/munin-node b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/munin-node index e766928f..e766928f 100644 --- a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/munin-node +++ b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/munin-node diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/jtk1a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds index e990c127..e990c127 100755 --- a/hosts/opi2a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds +++ b/hosts/jtk1a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup index bbea69fa..bbea69fa 100755 --- a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup +++ b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup index 73f4083c..73f4083c 100755 --- a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup +++ b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment index 27fd6445..27fd6445 100755 --- a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment +++ b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment diff --git a/hosts/opi2a-armhf-rb/etc/pbuilderrc b/hosts/jtk1a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/opi2a-armhf-rb/etc/pbuilderrc +++ b/hosts/jtk1a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/opi2a-armhf-rb/etc/postfix/main.cf b/hosts/jtk1a-armhf-rb/etc/postfix/main.cf index 729202bb..7f9e760b 100644 --- a/hosts/opi2a-armhf-rb/etc/postfix/main.cf +++ b/hosts/jtk1a-armhf-rb/etc/postfix/main.cf @@ -27,12 +27,12 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for # information on enabling SSL in the smtp client. -myhostname = opi2a-armhf-rb.debian.net +myhostname = jtk1a-armhf-rb.debian.net alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname -mydestination = opi2a-armhf-rb.debian.net, localhost -relayhost = +mydestination = jtk1a-armhf-rb.debian.net, localhost +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/opi2a-armhf-rb/etc/rc.local b/hosts/jtk1a-armhf-rb/etc/rc.local index 1c4ece10..1c4ece10 100755 --- a/hosts/opi2a-armhf-rb/etc/rc.local +++ b/hosts/jtk1a-armhf-rb/etc/rc.local diff --git a/hosts/opi2a-armhf-rb/etc/schroot/default/fstab b/hosts/jtk1a-armhf-rb/etc/schroot/default/fstab index 74468dd2..74468dd2 100644 --- a/hosts/opi2a-armhf-rb/etc/schroot/default/fstab +++ b/hosts/jtk1a-armhf-rb/etc/schroot/default/fstab diff --git a/hosts/opi2a-armhf-rb/etc/schroot/default/nssdatabases b/hosts/jtk1a-armhf-rb/etc/schroot/default/nssdatabases index 72615e5d..72615e5d 100644 --- a/hosts/opi2a-armhf-rb/etc/schroot/default/nssdatabases +++ b/hosts/jtk1a-armhf-rb/etc/schroot/default/nssdatabases diff --git a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins index 96d501ef..96d501ef 100644 --- a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins +++ b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins diff --git a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins-adm b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins-adm index 3c357be2..3c357be2 100644 --- a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins-adm +++ b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins-adm diff --git a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-packages b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-packages index 28844e5a..28844e5a 100755 --- a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-packages +++ b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-packages diff --git a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel index 80f45bfb..80f45bfb 100755 --- a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel +++ b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel diff --git a/hosts/opi2a-armhf-rb/usr/local/sbin/nagios-check-libs b/hosts/jtk1a-armhf-rb/usr/local/sbin/nagios-check-libs index 77b37805..77b37805 100755 --- a/hosts/opi2a-armhf-rb/usr/local/sbin/nagios-check-libs +++ b/hosts/jtk1a-armhf-rb/usr/local/sbin/nagios-check-libs diff --git a/hosts/odu3a-armhf-rb/etc/pbuilderrc b/hosts/odu3a-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/odu3a-armhf-rb/etc/pbuilderrc +++ b/hosts/odu3a-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/odu3a-armhf-rb/etc/postfix/main.cf b/hosts/odu3a-armhf-rb/etc/postfix/main.cf index 1d8ce979..473a5cd0 100644 --- a/hosts/odu3a-armhf-rb/etc/postfix/main.cf +++ b/hosts/odu3a-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = odu3a-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/odxu4-armhf-rb/etc/pbuilderrc b/hosts/odxu4-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/odxu4-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/odxu4-armhf-rb/etc/postfix/main.cf b/hosts/odxu4-armhf-rb/etc/postfix/main.cf index e4747312..86551d04 100644 --- a/hosts/odxu4-armhf-rb/etc/postfix/main.cf +++ b/hosts/odxu4-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = odxu4-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilderrc b/hosts/odxu4b-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/odxu4b-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4b-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/odxu4b-armhf-rb/etc/postfix/main.cf b/hosts/odxu4b-armhf-rb/etc/postfix/main.cf index ea0750ac..2fee1e00 100644 --- a/hosts/odxu4b-armhf-rb/etc/postfix/main.cf +++ b/hosts/odxu4b-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = odxu4b-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/odxu4c-armhf-rb/etc/postfix/main.cf b/hosts/odxu4c-armhf-rb/etc/postfix/main.cf index 7d66f03f..375ed2d2 100644 --- a/hosts/odxu4c-armhf-rb/etc/postfix/main.cf +++ b/hosts/odxu4c-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = odxu4c-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/opi2a b/hosts/opi2a deleted file mode 120000 index 48aff003..00000000 --- a/hosts/opi2a +++ /dev/null @@ -1 +0,0 @@ -opi2a-armhf-rb
\ No newline at end of file diff --git a/hosts/opi2b-armhf-rb/etc/pbuilderrc b/hosts/opi2b-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/opi2b-armhf-rb/etc/pbuilderrc +++ b/hosts/opi2b-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/opi2b-armhf-rb/etc/postfix/main.cf b/hosts/opi2b-armhf-rb/etc/postfix/main.cf index a690d2ae..1fd59381 100644 --- a/hosts/opi2b-armhf-rb/etc/postfix/main.cf +++ b/hosts/opi2b-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = opi2b-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/opi2c-armhf-rb/etc/pbuilderrc b/hosts/opi2c-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/opi2c-armhf-rb/etc/pbuilderrc +++ b/hosts/opi2c-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/opi2c-armhf-rb/etc/postfix/main.cf b/hosts/opi2c-armhf-rb/etc/postfix/main.cf index 9c75c1cf..e94116e3 100644 --- a/hosts/opi2c-armhf-rb/etc/postfix/main.cf +++ b/hosts/opi2c-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = opi2c-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilderrc b/hosts/profitbricks-build10-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build10-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build10-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build2-i386/etc/pbuilderrc b/hosts/profitbricks-build2-i386/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build2-i386/etc/pbuilderrc +++ b/hosts/profitbricks-build2-i386/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build3-amd64/etc/pbuilderrc b/hosts/profitbricks-build3-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build3-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build3-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build4-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilderrc b/hosts/profitbricks-build5-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build5-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build5-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build6-i386/etc/pbuilderrc b/hosts/profitbricks-build6-i386/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build6-i386/etc/pbuilderrc +++ b/hosts/profitbricks-build6-i386/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/profitbricks-build9-amd64/etc/pbuilderrc b/hosts/profitbricks-build9-amd64/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/profitbricks-build9-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build9-amd64/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/rpi2b-armhf-rb/etc/pbuilderrc +++ b/hosts/rpi2b-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf index ea91ceed..f57f170b 100644 --- a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf +++ b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = rpi2b-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilderrc b/hosts/rpi2c-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/rpi2c-armhf-rb/etc/pbuilderrc +++ b/hosts/rpi2c-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/rpi2c-armhf-rb/etc/postfix/main.cf b/hosts/rpi2c-armhf-rb/etc/postfix/main.cf index 65fb4155..bc41a7a9 100644 --- a/hosts/rpi2c-armhf-rb/etc/postfix/main.cf +++ b/hosts/rpi2c-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = rpi2c-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/wbd0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbd0-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/wbd0-armhf-rb/etc/postfix/main.cf b/hosts/wbd0-armhf-rb/etc/postfix/main.cf index 3d93e6ce..3b5be28e 100644 --- a/hosts/wbd0-armhf-rb/etc/postfix/main.cf +++ b/hosts/wbd0-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = wbd0-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc index a13ed5b3..127b42ff 100644 --- a/hosts/wbq0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc @@ -8,14 +8,14 @@ # cater for different locations case $HOSTNAME in jenkins|jenkins-test-vm|profitbricks-build*) MIRRORSITE=http://ftp.de.debian.org/debian ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) MIRRORSITE=http://ftp.us.debian.org/debian ;; + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) MIRRORSITE=http://ftp.us.debian.org/debian ;; *) echo "unsupported host, exiting." ; exit 1 ;; esac # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway case $HOSTNAME in profitbricks-build*i386) EATMYDATA=yes ;; - bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*) + bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*) EATMYDATA=yes ;; *) ;; esac diff --git a/hosts/wbq0-armhf-rb/etc/postfix/main.cf b/hosts/wbq0-armhf-rb/etc/postfix/main.cf index 0053b2b3..98ef11cb 100644 --- a/hosts/wbq0-armhf-rb/etc/postfix/main.cf +++ b/hosts/wbq0-armhf-rb/etc/postfix/main.cf @@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname mydestination = wbq0-armhf-rb.debian.net, localhost -relayhost = +relayhost = mail.holgerlevsen.de #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 mailbox_size_limit = 0 diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 7c293c3a..2e5c047f 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -317,12 +317,12 @@ - 'ff2b': { my_arch: 'armhf' } - 'ff4a': { my_arch: 'armhf' } - 'hb0': { my_arch: 'armhf' } + - 'jtk1a': { my_arch: 'armhf' } - 'wbq0': { my_arch: 'armhf' } - 'odxu4': { my_arch: 'armhf' } - 'odxu4b': { my_arch: 'armhf' } - 'odxu4c': { my_arch: 'armhf' } - 'odu3a': { my_arch: 'armhf' } - - 'opi2a': { my_arch: 'armhf' } - 'opi2b': { my_arch: 'armhf' } - 'opi2c': { my_arch: 'armhf' } - 'wbd0': { my_arch: 'armhf' } @@ -367,12 +367,12 @@ - 'ff2b': { my_arch: 'armhf' } - 'ff4a': { my_arch: 'armhf' } - 'hb0': { my_arch: 'armhf' } + - 'jtk1a': { my_arch: 'armhf' } - 'wbq0': { my_arch: 'armhf' } - 'odxu4': { my_arch: 'armhf' } - 'odxu4b': { my_arch: 'armhf' } - 'odxu4c': { my_arch: 'armhf' } - 'odu3a': { my_arch: 'armhf' } - - 'opi2a': { my_arch: 'armhf' } - 'opi2b': { my_arch: 'armhf' } - 'opi2c': { my_arch: 'armhf' } - 'wbd0': { my_arch: 'armhf' } @@ -557,7 +557,7 @@ # could have all archs in one block, but it seems cleaner this way # to choose new jobs: - # for i in bbx15 bpi0 cbxi4a cbxi4b cbxi4pro0 cb3a ff2a ff2b ff4a hb0 odxu4 odxu4b odxu4c odu3a opi2a opi2b opi2c rpi2b rpi2c wbd0 wbq0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done + # for i in bbx15 bpi0 cbxi4a cbxi4b cbxi4pro0 cb3a ff2a ff2b ff4a hb0 jtk1a odxu4 odxu4b odxu4c odu3a opi2b opi2c rpi2b rpi2c wbd0 wbq0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done # 8 jobs for quad-cores with 4 gb ram # 6 jobs for octo-cores with 2 gb ram # 6 jobs for quad-cores with 2 gb ram diff --git a/update_jdn.sh b/update_jdn.sh index efadedc2..640b12b5 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -501,11 +501,6 @@ if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then for i in apache_accesses apache_volume ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done sudo ln -s /usr/share/munin/plugins/loggrep jenkins_oom fi - if [ "$HOSTNAME" != "opi2a" ] ; then - # opi2a is strangely broken - # so this is just a hackish workaround for that… - sudo service munin-node force-reload - fi fi explain "packages configured." |