diff options
38 files changed, 129 insertions, 76 deletions
diff --git a/deploy_everywhere b/deploy_everywhere index 6a7ba349..9c3bee89 100755 --- a/deploy_everywhere +++ b/deploy_everywhere @@ -132,7 +132,7 @@ for i in $HOSTS ; do command="$real_command" if $reset_clock ; then case $i in - profitbricks-build4-amd64*|profitbricks-build5-amd64*|profitbricks-build6-i386*) + profitbricks-build4-amd64*|profitbricks-build5-amd64*|profitbricks-build6-i386*|profitbricks-build15-amd64*|profitbricks-build16-i386*) # set correct date command="sudo ntpdate -b de.pool.ntp.org && $real_command && sudo date --set=\"+398 days +6 hours + 23 minutes\" && echo '__$(echo $i|cut -d '.' -f1)=ok__'" ;; diff --git a/hosts/bbx15-armhf-rb/etc/pbuilderrc b/hosts/bbx15-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/bbx15-armhf-rb/etc/pbuilderrc +++ b/hosts/bbx15-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/bpi0-armhf-rb/etc/pbuilderrc +++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/cb3a-armhf-rb/etc/pbuilderrc b/hosts/cb3a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/cb3a-armhf-rb/etc/pbuilderrc +++ b/hosts/cb3a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc +++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/ff2a-armhf-rb/etc/pbuilderrc b/hosts/ff2a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/ff2a-armhf-rb/etc/pbuilderrc +++ b/hosts/ff2a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/ff2b-armhf-rb/etc/pbuilderrc b/hosts/ff2b-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/ff2b-armhf-rb/etc/pbuilderrc +++ b/hosts/ff2b-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/ff4a-armhf-rb/etc/pbuilderrc b/hosts/ff4a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/ff4a-armhf-rb/etc/pbuilderrc +++ b/hosts/ff4a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/hb0-armhf-rb/etc/pbuilderrc +++ b/hosts/hb0-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/jenkins-test-vm/etc/pbuilderrc b/hosts/jenkins-test-vm/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/jenkins-test-vm/etc/pbuilderrc +++ b/hosts/jenkins-test-vm/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/jenkins/etc/pbuilderrc +++ b/hosts/jenkins/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/jtk1a-armhf-rb/etc/pbuilderrc b/hosts/jtk1a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/jtk1a-armhf-rb/etc/pbuilderrc +++ b/hosts/jtk1a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/odu3a-armhf-rb/etc/pbuilderrc b/hosts/odu3a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/odu3a-armhf-rb/etc/pbuilderrc +++ b/hosts/odu3a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/odxu4-armhf-rb/etc/pbuilderrc b/hosts/odxu4-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/odxu4-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilderrc b/hosts/odxu4b-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/odxu4b-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4b-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc +++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/opi2a-armhf-rb/etc/pbuilderrc b/hosts/opi2a-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/opi2a-armhf-rb/etc/pbuilderrc +++ b/hosts/opi2a-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/opi2b-armhf-rb/etc/pbuilderrc b/hosts/opi2b-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/opi2b-armhf-rb/etc/pbuilderrc +++ b/hosts/opi2b-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/opi2c-armhf-rb/etc/pbuilderrc b/hosts/opi2c-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/opi2c-armhf-rb/etc/pbuilderrc +++ b/hosts/opi2c-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilderrc b/hosts/profitbricks-build10-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build10-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build10-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build11-amd64/etc/pbuilderrc b/hosts/profitbricks-build11-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build11-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build11-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build15-amd64/etc/pbuilderrc b/hosts/profitbricks-build15-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build15-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build15-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build15-amd64/etc/rc.local b/hosts/profitbricks-build15-amd64/etc/rc.local index 1c4ece10..b3a760e4 100755 --- a/hosts/profitbricks-build15-amd64/etc/rc.local +++ b/hosts/profitbricks-build15-amd64/etc/rc.local @@ -13,4 +13,21 @@ echo "$(date -u) - system was rebooted" | mail -s "$(hostname -f) rebooted" root +# stop ntp +service ntp stop || true +# disable systemd date services (and don't fail if systemd ain't running) +systemctl disable systemd-timesyncd +systemctl disable systemd-timedated +systemctl stop systemd-timesyncd || true +systemctl stop systemd-timedated || true +# set correct date +ntpdate -b de.pool.ntp.org +# set fake date +date --set="+398 days +6 hours + 23 minutes" +# disable check for outdated packages as in the future (like this) +# packages from security.d.o will appear outdated always… +ln -sf /bin/true /usr/local/bin/dsa-check-packages +# finally report success +echo "$(date -u) - system is running in the future now" | mail -s "$(hostname -f) in the future" root + exit 0 diff --git a/hosts/profitbricks-build2-i386/etc/pbuilderrc b/hosts/profitbricks-build2-i386/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build2-i386/etc/pbuilderrc +++ b/hosts/profitbricks-build2-i386/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build3-amd64/etc/pbuilderrc b/hosts/profitbricks-build3-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build3-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build3-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build4-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilderrc b/hosts/profitbricks-build5-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build5-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build5-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build6-i386/etc/pbuilderrc b/hosts/profitbricks-build6-i386/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build6-i386/etc/pbuilderrc +++ b/hosts/profitbricks-build6-i386/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build7-amd64/etc/pbuilderrc b/hosts/profitbricks-build7-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build7-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build7-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/profitbricks-build9-amd64/etc/pbuilderrc b/hosts/profitbricks-build9-amd64/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/profitbricks-build9-amd64/etc/pbuilderrc +++ b/hosts/profitbricks-build9-amd64/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/rpi2b-armhf-rb/etc/pbuilderrc +++ b/hosts/rpi2b-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilderrc b/hosts/rpi2c-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/rpi2c-armhf-rb/etc/pbuilderrc +++ b/hosts/rpi2c-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/wbd0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbd0-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc index 127b42ff..d6b11e2c 100644 --- a/hosts/wbq0-armhf-rb/etc/pbuilderrc +++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc @@ -37,8 +37,9 @@ if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then fi # needed to ignore failures due to running 398 days in the future… -# (only on those 2 nodes running in the future…) -if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then +# (only on those 4 nodes running in the future…) +if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then case "$PBUILDER_OPERATION" in create) APTGETOPT=(-o Acquire::Check-Valid-Until="false") diff --git a/update_jdn.sh b/update_jdn.sh index dfd999d7..62506164 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -32,7 +32,7 @@ explain "$(date) - begin deployment update." # some nodes need special treatment… case $HOSTNAME in - profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386) + profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) # set correct date sudo service ntp stop sudo ntpdate -b de.pool.ntp.org @@ -263,7 +263,7 @@ if [ -f /etc/debian_version ] ; then esac # needed to run the 2nd reproducible builds nodes in the future... case $HOSTNAME in - profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386) DEBS="$DEBS ntpdate" ;; + profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) DEBS="$DEBS ntpdate" ;; *) ;; esac # needed to run coreboot/openwrt/lede/netbsd/fedora jobs @@ -452,8 +452,9 @@ if [ -f /etc/debian_version ] ; then || echo "this should only fail on the first install" fi # for varying kernels - # we use bpo kernels on pb-build5+6 (and i386 kernel on pb-build2-i386) - if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ]; then + # we use bpo kernels on pb-build5+6+15+16 (and i386 kernel on pb-build2-i386) + if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \ + [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then $UP2DATE || sudo apt-get install -t jessie-backports linux-image-amd64 || echo "this should only fail on the first install" fi # only needed on the main node @@ -718,7 +719,7 @@ explain "$(date) - finished deployment." # finally! case $HOSTNAME in # set time back to the future - profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386) + profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) sudo date --set="+398 days +6 hours + 23 minutes" ;; jenkins) |