reproducible Debian: drop jtk1b

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

README

@@ -149,7 +149,7 @@ Installation tests inside chroot environments.
 *** six quad-cores (cbxi4a, cbxi4b, ff4a, jtx1a, jtx1b, jtx1c) with 4gb ram,
 *** one hexa-core (ff64a) with 2gb ram,
 *** three octo-cores (odxu4a, odxu4b and odxu4c) with 2gb ram,
-*** twelve quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2a, opi2b, opi2c, jtk1a, jtk1b, p64b and p64c) with 2gb ram, and
+*** twelve quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2a, opi2b, opi2c, jtk1a, p64b and p64c) with 2gb ram, and
 *** two dual-core (bbx15 and cb3a) with 2gb ram each.
 * We would love to have more or more powerful ARM hardware in the future, if you can help, please talk to us!
 

bin/jenkins_node_definitions.sh

@@ -29,7 +29,6 @@ ff2b-armhf-rb.debian.net
 ff4a-armhf-rb.debian.net
 ff64a-armhf-rb.debian.net
 jtk1a-armhf-rb.debian.net
-jtk1b-armhf-rb.debian.net
 jtx1a-armhf-rb.debian.net
 jtx1b-armhf-rb.debian.net
 jtx1c-armhf-rb.debian.net
@@ -111,9 +110,6 @@ get_node_ssh_port() {
 	  jtk1a*)
 	    PORT=2246
 	    ;;
-	  jtk1b*)
-	     PORT=2252
-	     ;;
 	  jtx1a*)
 	    PORT=2249
 	    ;;

bin/reproducible_build_service.sh

@@ -117,7 +117,7 @@ choose_nodes() {
 		arm64_31)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled13-arm64 ;;
 		arm64_32)	NODE1=codethink-sled16-arm64	NODE2=codethink-sled15-arm64 ;;
 		# to choose new armhf jobs:
-            #   for i in cb3a bbx15 cbxi4pro0 ff2a ff2b ff64a jtk1a jtk1b odxu4a odxu4b odxu4c odu3a opi2a opi2b opi2c p64b p64c wbq0 cbxi4a cbxi4b ff4a jtx1a jtx1b jtx1c; do echo "$i: " ; grep NODE1 bin/reproducible_build_service.sh|grep armhf|grep $i-armhf ; done
+            #   for i in cb3a bbx15 cbxi4pro0 ff2a ff2b ff64a jtk1a odxu4a odxu4b odxu4c odu3a opi2a opi2b opi2c p64b p64c wbq0 cbxi4a cbxi4b ff4a jtx1a jtx1b jtx1c; do echo "$i: " ; grep NODE1 bin/reproducible_build_service.sh|grep armhf|grep $i-armhf ; done
 	        #       6 jobs for quad-cores with 4 gb ram
 	        #       4 jobs for octo-cores with 2 gb ram
 	        #       4 jobs for hexa-cores with 2 gb ram
@@ -143,14 +143,10 @@ choose_nodes() {
 		armhf_15)	NODE1=ff2b-armhf-rb			NODE2=opi2c-armhf-rb ;;
 		armhf_16)	NODE1=jtx1b-armhf-rb		NODE2=p64b-armhf-rb ;;
 		armhf_17)	NODE1=jtx1b-armhf-rb		NODE2=opi2c-armhf-rb ;;
-		armhf_18)	NODE1=jtk1b-armhf-rb		NODE2=opi2b-armhf-rb ;;
-		armhf_19)	NODE1=jtk1b-armhf-rb		NODE2=opi2a-armhf-rb ;;
 		armhf_20)	NODE1=odxu4a-armhf-rb		NODE2=opi2b-armhf-rb ;;
 		armhf_21)	NODE1=odxu4a-armhf-rb		NODE2=opi2a-armhf-rb ;;
 		armhf_22)	NODE1=odxu4b-armhf-rb		NODE2=odu3a-armhf-rb ;;
-		armhf_23)	NODE1=odxu4b-armhf-rb		NODE2=jtk1b-armhf-rb ;;
 		armhf_24)	NODE1=odxu4c-armhf-rb		NODE2=jtx1c-armhf-rb ;;
-		armhf_25)	NODE1=odxu4c-armhf-rb		NODE2=jtk1b-armhf-rb ;;
 		armhf_26)	NODE1=odu3a-armhf-rb		NODE2=odxu4a-armhf-rb ;;
 		armhf_27)	NODE1=odu3a-armhf-rb		NODE2=jtx1b-armhf-rb ;;
 		armhf_28)	NODE1=opi2a-armhf-rb		NODE2=odxu4c-armhf-rb ;;

deploy_jdn

@@ -63,7 +63,6 @@ ff2b-armhf-rb.debian.net
 ff4a-armhf-rb.debian.net
 ff64a-armhf-rb.debian.net
 jtk1a-armhf-rb.debian.net
-jtk1b-armhf-rb.debian.net
 jtx1a-armhf-rb.debian.net
 jtx1b-armhf-rb.debian.net
 jtx1c-armhf-rb.debian.net

hosts/jenkins/etc/munin/munin.conf

@@ -476,16 +476,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
-[jtk1b-armhf-rb.debian.net]
-    address ssh://jenkins@jtk1b-armhf-rb.debian.net:2252/bin/nc localhost 4949
-    use_node_name yes
-    diskstats_latency.sda.avgwrwait.warning 0:20
-    diskstats_latency.sda.avgrdwait.warning 0:10
-    diskstats_latency.graph no
-    diskstats_throughput.graph no
-    diskstats_utilization.graph no
-    diskstats_iops.graph no
-
 [jtx1a-armhf-rb.debian.net]
     address ssh://jenkins@jtx1a-armhf-rb.debian.net:2249/bin/nc localhost 4949
     use_node_name yes
@@ -689,5 +679,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 profitbricks-build11-amd64.debian.net profitbricks-build12-i386.debian.net profitbricks-build15-amd64.debian.net profitbricks-build16-i386.debian.net codethink-sled9-arm64.debian.net codethink-sled10-arm64.debian.net codethink-sled11-arm64.debian.net codethink-sled12-arm64.debian.net codethink-sled13-arm64.debian.net codethink-sled14-arm64.debian.net codethink-sled15-arm64.debian.net codethink-sled16-arm64.debian.net bbx15-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 ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtk1b-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-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 profitbricks-build11-amd64.debian.net profitbricks-build12-i386.debian.net profitbricks-build15-amd64.debian.net profitbricks-build16-i386.debian.net codethink-sled9-arm64.debian.net codethink-sled10-arm64.debian.net codethink-sled11-arm64.debian.net codethink-sled12-arm64.debian.net codethink-sled13-arm64.debian.net codethink-sled14-arm64.debian.net codethink-sled15-arm64.debian.net codethink-sled16-arm64.debian.net bbx15-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 ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net
 

hosts/jtk1b

-jtk1b-armhf-rb/
\ No newline at end of file

hosts/jtk1b-armhf-rb/etc/munin/munin-node.conf

-#
-# Example config-file for munin-node
-#
-
-log_level 4
-log_file /var/log/munin/munin-node.log
-pid_file /var/run/munin/munin-node.pid
-
-background 1
-setsid 1
-
-user root
-group root
-
-# This is the timeout for the whole transaction.
-# Units are in sec. Default is 15 min
-#
-# global_timeout 900
-
-# This is the timeout for each plugin.
-# Units are in sec. Default is 1 min
-#
-# timeout 60
-
-# Regexps for files to ignore
-ignore_file [\#~]$
-ignore_file DEADJOE$
-ignore_file \.bak$
-ignore_file %$
-ignore_file \.dpkg-(tmp|new|old|dist)$
-ignore_file \.rpm(save|new)$
-ignore_file \.pod$
-
-# Set this if the client doesn't report the correct hostname when
-# telnetting to localhost, port 4949
-#
-#host_name localhost.localdomain
-
-# A list of addresses that are allowed to connect.  This must be a
-# regular expression, since Net::Server does not understand CIDR-style
-# network notation unless the perl module Net::CIDR is installed.  You
-# may repeat the allow line as many times as you'd like
-
-allow ^127\.0\.0\.1$
-allow ^::1$
-
-# If you have installed the Net::CIDR perl module, you can use one or more
-# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
-# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
-# *must* be provided, even if it's /32
-#
-# Example:
-#
-# cidr_allow 127.0.0.1/32
-# cidr_allow 192.0.2.0/24
-# cidr_deny  192.0.2.42/32
-
-# Which address to bind to;
-host *
-# host 127.0.0.1
-
-# And which port
-port 4949
-
-allow ^78\.137\.96\.196
-hostname jtk1b-armhf-rb.debian.net

hosts/jtk1b-armhf-rb/etc/postfix/main.cf

-# See /usr/share/postfix/main.cf.dist for a commented, more complete version
-
-
-# Debian specific:  Specifying a file name will cause the first
-# line of that file to be used as the name.  The Debian default
-# is /etc/mailname.
-#myorigin = /etc/mailname
-
-smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
-biff = no
-
-# appending .domain is the MUA's job.
-append_dot_mydomain = no
-
-# Uncomment the next line to generate "delayed mail" warnings
-#delay_warning_time = 4h
-
-readme_directory = no
-
-# TLS parameters
-smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-smtpd_use_tls=yes
-smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
-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 = jtk1b-armhf-rb.debian.net
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = jtk1b-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
-recipient_delimiter = +
-inet_interfaces = all
-mailbox_command = /usr/bin/procmail -a "$EXTENSION"

hosts/jtk1b-armhf-rb/etc/ssh/sshd_config

-# Package generated configuration file
-# See the sshd_config(5) manpage for details
-
-# What ports, IPs and protocols we listen for
-Port 22
-Port 2252
-#AddressFamily any
-#ListenAddress ::
-#ListenAddress 0.0.0.0
-
-HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_ecdsa_key
-HostKey /etc/ssh/ssh_host_ed25519_key
-
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2n
-PermitRootLogin prohibit-password
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-PubkeyAuthentication yes
-
-AuthorizedKeysFile /var/lib/misc/userkeys/%u %h/.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to yes to enable challenge-response passwords (beware issues with
-# some PAM modules and threads)
-ChallengeResponseAuthentication no
-
-# Change to no to disable tunnelled clear text passwords
-PasswordAuthentication no
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-#GSSAPIStrictAcceptorCheck yes
-#GSSAPIKeyExchange no
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-PrintMotd no
-#PrintLastLog yes
-#TCPKeepAlive yes
-#UseLogin no
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS no
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#VersionAddendum none
-
-# no default banner path
-#Banner none
-
-# Allow client to pass locale environment variables
-AcceptEnv LANG LC_*
-
-# override default of no subsystems
-Subsystem       sftp    /usr/lib/openssh/sftp-server

jenkins-home/offline_nodes

@@ -2,8 +2,6 @@
 # No builds will be dispatched to those nodes, and the nodes will be marked
 # as offline in the jenkins UI.
 
-jtk1b-armhf-rb.debian.net
-jtk1b-armhf-rb
 ff64a-armhf-rb.debian.net
 ff64a-armhf-rb
 

job-cfg/reproducible.yaml

@@ -304,7 +304,6 @@
                 - 'ff4a':           { my_arch: 'armhf' }
                 - 'ff64a':          { my_arch: 'armhf' }
                 - 'jtk1a':          { my_arch: 'armhf' }
-                - 'jtk1b':          { my_arch: 'armhf' }
                 - 'jtx1a':          { my_arch: 'armhf' }
                 - 'jtx1b':          { my_arch: 'armhf' }
                 - 'jtx1c':          { my_arch: 'armhf' }
@@ -357,7 +356,6 @@
                 - 'ff4a':           { my_arch: 'armhf' }
                 - 'ff64a':          { my_arch: 'armhf' }
                 - 'jtk1a':          { my_arch: 'armhf' }
-                - 'jtk1b':          { my_arch: 'armhf' }
                 - 'jtx1a':          { my_arch: 'armhf' }
                 - 'jtx1b':          { my_arch: 'armhf' }
                 - 'jtx1c':          { my_arch: 'armhf' }
@@ -418,7 +416,6 @@
                 - 'ff4a':           { my_arch: 'armhf' }
                 - 'ff64a':          { my_arch: 'armhf' }
                 - 'jtk1a':          { my_arch: 'armhf' }
-                - 'jtk1b':          { my_arch: 'armhf' }
                 - 'jtx1a':          { my_arch: 'armhf' }
                 - 'jtx1b':          { my_arch: 'armhf' }
                 - 'jtx1c':          { my_arch: 'armhf' }