[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible F-Droid: move jobs from profitbricks7 to osuosl168

Holger Levsen gitlab at salsa.debian.org
Sat Jan 19 15:50:55 GMT 2019 

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
34a9e2bb by Holger Levsen at 2019-01-19T15:50:32Z
reproducible F-Droid: move jobs from profitbricks7 to osuosl168

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

- - - - -


19 changed files:

- THANKS.head
- TODO
- bin/common-functions.sh
- bin/reproducible_html_nodes_info.sh
- deploy_jdn
- hosts/common/etc/rc.local
- hosts/common/etc/sudoers.d/jenkins
- hosts/jenkins/etc/munin/munin.conf
- − hosts/profitbricks-build7-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/profitbricks-build7-amd64/etc/mock/fedora-23-x86_64.cfg
- − hosts/profitbricks-build7-amd64/etc/postfix/main.cf
- − hosts/profitbricks-build7-amd64/etc/schroot/default/fstab
- − hosts/profitbricks-build7-amd64/etc/squid/squid.conf
- − hosts/profitbricks-build7-amd64/etc/sudoers.d/jenkins
- − hosts/profitbricks-build7-amd64/etc/yum/repos.d/fedora-23-src.repo
- − hosts/profitbricks-build7-amd64/etc/yum/repos.d/fedora.repo
- − hosts/profitbricks-build7-amd64/etc/yum/repos.d/reproducible.repo
- job-cfg/reproducible.yaml
- update_jdn.sh


Changes:

=====================================
THANKS.head
=====================================
@@ -7,8 +7,8 @@
  ** 15 cores and 48 GB memory for profitbricks-build1-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
  ** 10 cores and 36 GB memory for profitbricks-build2-i386.debian.net used for building i386
 Debian packages for t.r-b.o
- ** 12 cores and 24 GB memory for profitbricks-build3-amd64.debian.net used for building OpenWrt, coreboot, Fedora, Archlinux and NetBSD for t.r-b.o
- ** 11 cores and 24 GB memory for profitbricks-build4-amd64.debian.net used for building OpenWrt, coreboot, Fedora, Archlinux and NetBSD for t.r-b.o, running in the future
+ ** 12 cores and 24 GB memory for profitbricks-build3-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o
+ ** 11 cores and 24 GB memory for profitbricks-build4-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o, running in the future
  ** 16 cores and 48 GB memory for profitbricks-build5-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
  ** 9 cores and 36 GB memory for profitbricks-build6-i386.debian.net used for building i386 Debian packages for t.r-b.o, running in the future
  ** 15 cores and 48 GB memory for profitbricks-build11-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
@@ -16,7 +16,6 @@ Debian packages for t.r-b.o
 Debian packages for t.r-b.o
  ** 16 cores and 48 GB memory for profitbricks-build15-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
  ** 9 cores and 36 GB memory for profitbricks-build16-i386.debian.net sed for building i386 Debian packages for t.r-b.o, running in the future
- ** 2 cores and 8 GB memory for profitbricks-build7-amd64.debian.net used for building F-Droid for t.r-b.o
  ** 5 cores and 10 GB memory for profitbricks-build9-amd64.debian.net used for rebootstrap jobs
  ** 4 cores and 12 GB memory for profitbricks-build10-amd64.debian.net used for chroot-installation jobs
  ** 9 cores and 19 GB memory for freebsd-jenkins.debian.net (also running on Profitbricks virtual hardware), used for building FreeBSD for t.r-b.o
@@ -40,9 +39,9 @@ Debian packages for t.r-b.o
  * link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for jenkins.debian.net, reproducible.debian.net and tests.reproducible-builds.org.
  * In December 2018 were given access to eight nodes which were donated by Facebook to the GCC Compile Farm project and are now hosted by OSUOSL:
   ** 32 cores with 144 GB memory for osuosl167-amd64.debian.net
-  ** 32 cores with 144 GB memory for osuosl168-amd64.debian.net
-  ** 32 cores with 144 GB memory for osuosl169-amd64.debian.net
-  ** 32 cores with 144 GB memory for osuosl170-amd64.debian.net
+  ** 32 cores with 144 GB memory for osuosl168-amd64.debian.net used for building F-Droid for t.r-b.o
+  ** 32 cores with 144 GB memory for osuosl169-amd64.debian.net used for building Arch Linux for t.r-b.o
+  ** 32 cores with 144 GB memory for osuosl170-amd64.debian.net used for building Arch Linux for t.r-b.o
   ** 32 cores with 144 GB memory for osuosl171-amd64.debian.net
   ** 32 cores with 144 GB memory for osuosl172-amd64.debian.net
   ** 32 cores with 144 GB memory for osuosl173-amd64.debian.net


=====================================
TODO
=====================================
@@ -55,7 +55,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * teach bin/chroot-*.sh and bin/d-i_build.sh how to nicely deal with network problems… (as both reproducible_build.sh and schroot-create.sh do)
 * use static IP for the nodes (h01ger)
 * use vmdebootstrap where applicable
-* Tango Icons are gone: #824477 - update footer once this bug is fixed
 * this is outdated with salsa: add to all git post-receive hooks: `curl -s "https://jenkins.debian.net/git/notifyCommit?url=https://salsa.debian.org/installer-team/$(basename $PWD .git)"` which will trigger jenkins to pull (check) that git repo…
 * salsa stuff:
 ** triggers for d-i repos are missing
@@ -63,27 +62,21 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 === new nodes at OSUOSL
 
 * use those nodes, preliminary plan:
-** osuosl167: squid (only, atm)
-** osuosl168: fdroid
-** osuosl169: archlinux
-** osuosl170: archlinux (future)
+** done: osuosl167: squid (only, atm)
+** done: osuosl168: fdroid
+*** shutdown pb7
+*** inform hans
+** done: osuosl169: archlinux
+** done: osuosl170: archlinux (future)
 ** osuosl171: openwrt, coreboot, netbsd, opensuse
 ** osuosl172: openwrt, coreboot, netbsd, opensuse (future)
 ** osuosl173: debian
 ** osuosl174: debian (future)
-* tmpfs, setup /srv/workspace as needed
-* make nodes run in the future
 * add to README 
-* probably add links to OSUOSL in THANKS and definitly explain there usage
+* add link to OSUOSL in THANKS and explain usage
 * drop 'setup in progress' from r_html_nodes_info
-* document how to contact OSUOSL
 * blog post when done
 
-=== ToDo for improving disk space
-
-* make live-build jobs work again or remove them
-* make sure the live-build jobs clean up /srv/live-build/results/*iso once they are done. thats 8gb wasted.
-
 ==== proper backup
 
 * postponed til we run on .debian.org


=====================================
bin/common-functions.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2014-2018 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2019 Holger Levsen <holger at layer-acht.org>
 #         © 2018      Mattia Rizzolo <mattia at mapreri.org>
 # released under the GPLv=2
 
@@ -147,9 +147,6 @@ else
 		profitbricks-build4*|profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
 			# pb datacenter in frankfurt uses pb10 as proxy:
 			export http_proxy="http://85.184.249.68:3128" ;;
-		profitbricks-build7*)
-			# let pb7 use its own proxy for the fdroid stuff:
-			export http_proxy="http://127.0.0.1:3128" ;;
 		osuosl*)
 			# all nodes at OSUOSL use osuosl167 as proxy:
 			export http_proxy="http://10.6.5.46:3128" ;;


=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -19,9 +19,9 @@ explain_nodes() {
 		jenkins)	;;
 		profitbricks3)	write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
 		profitbricks4)	write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
-		profitbricks7)	write_page "<br /><small>(r-b F-Droid builds)</small>" ;;
 		profitbricks9)	write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
 		profitbricks10)	write_page "<br /><small>(jenkins.d.n chroot-installation jobs)</small>" ;;
+		osuosl168)	write_page "<br /><small>(r-b F-Droid builds)</small>" ;;
 		osuosl169)	write_page "<br /><small>(r-b Archlinux builds)</small>" ;;
 		osuosl170)	write_page "<br /><small>(r-b Archlinux builds)</small>" ;;
 		osuosl*)	write_page "<br /><small>(TBD - setup in progress)</small>" ;;
@@ -66,10 +66,9 @@ build_nodes_health_page() {
 				# pb4	r-b archlinux
 				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net"
 			elif [ "$NODE" = "profitbricks-build6-i386.debian.net" ] ; then
-				# pb7 	r-b fdroid build host
 				# pb9 	rebootstrap jobs
 				# pb10	chroot jobs
-				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build7-amd64.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net"
+				REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net"
 			fi
 		done
 		for NODE in $REPRODUCIBLE_NODES ; do
@@ -115,9 +114,9 @@ build_nodes_health_page() {
 				jenkins)	write_page "<td></td>" ;;
 				profitbricks3)	write_page "<td></td>" ;;
 				profitbricks4)	write_page "<td></td>" ;;
-				profitbricks7)	write_page "<td></td>" ;;
 				profitbricks9)	write_page "<td></td>" ;;
 				profitbricks10)	write_page "<td></td>" ;;
+				osuosl*)	write_page "<td></td>" ;;
 				*)		write_page "<td>"
 						SHORTNAME=$(echo $NODE | cut -d '.' -f1)
 						for WORKER in $(grep "${ARCH}_" /srv/jenkins/bin/reproducible_build_service.sh | grep -v \# |grep $SHORTNAME | cut -d ')' -f1) ; do
@@ -133,7 +132,6 @@ build_nodes_health_page() {
 					jenkins)	write_page "<td></td>" ;;
 					profitbricks3)	write_page "<td></td>" ;;
 					profitbricks4)	write_page "<td></td>" ;;
-					profitbricks7)	write_page "<td></td>" ;;
 					profitbricks9)	write_page "<td></td>" ;;
 					profitbricks10)	write_page "<td></td>" ;;
 					osuosl*)	write_page "<td></td>" ;;
@@ -215,7 +213,6 @@ build_graph_overview_pages() {
 							jenkins)	write_page "<td></td>" ; continue ;;
 							profitbricks3)	write_page "<td></td>" ; continue ;;
 							profitbricks4)	write_page "<td></td>" ; continue ;;
-							profitbricks7)	write_page "<td></td>" ; continue ;;
 							profitbricks9)	write_page "<td></td>" ; continue ;;
 							profitbricks10)	write_page "<td></td>" ; continue ;;
 							osuosl*)	write_page "<td></td>" ; continue ;;


=====================================
deploy_jdn
=====================================
@@ -51,7 +51,6 @@ profitbricks-build1-amd64.debian.net
 profitbricks-build3-amd64.debian.net
 profitbricks-build4-amd64.debian.net
 profitbricks-build5-amd64.debian.net
-profitbricks-build7-amd64.debian.net
 profitbricks-build9-amd64.debian.net
 profitbricks-build10-amd64.debian.net
 profitbricks-build11-amd64.debian.net
@@ -144,7 +143,6 @@ elif [ "$1" = "jenkins" ] ; then
 			4|pb4)	 HOSTS+=(profitbricks-build4-amd64.debian.net) ;;
 			5|pb5)	 HOSTS+=(profitbricks-build5-amd64.debian.net) ;;
 			6|pb6)	 HOSTS+=(profitbricks-build6-i386.debian.net) ;;
-			7|pb7)	 HOSTS+=(profitbricks-build7-amd64.debian.net) ;;
 			9|pb9)	 HOSTS+=(profitbricks-build9-amd64.debian.net) ;;
 			10|pb10) HOSTS+=(profitbricks-build10-amd64.debian.net) ;;
 			11|pb11) HOSTS+=(profitbricks-build11-amd64.debian.net) ;;


=====================================
hosts/common/etc/rc.local
=====================================
@@ -90,7 +90,8 @@ iptables -I INPUT -p udp --dport 111 -j DROP
 case $(hostname) in
 	profitbricks-build3*)	put_schroots_on_tmpfs ;;
 	profitbricks-build4*)	put_schroots_on_tmpfs ;;
-	profitbricks-build7*)	put_schroots_on_tmpfs ;;
+	osuosl-build168*)	put_schroots_on_tmpfs ;;
+	osuosl-build169*)	put_schroots_on_tmpfs ;;
 	osuosl-build170*)	put_schroots_on_tmpfs ;;
 	*)			;;
 esac


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -52,7 +52,9 @@ jenkins ALL=  \
 	/usr/bin/killall timeout, \
 	/usr/sbin/slay 1111, \
 	/usr/sbin/slay 2222, \
-	/usr/sbin/slay jenkins
+	/usr/sbin/slay jenkins, \
+	/bin/chmod -R a+rX /var/lib/libvirt/images
 
 # keep these environment variables
 Defaults        env_keep += "http_proxy", env_reset
+


=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -198,14 +198,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
-[profitbricks-build7-amd64.debian.net]
-    address 157.97.110.83
-    use_node_name yes
-    diskstats_latency.graph no
-    diskstats_throughput.graph no
-    diskstats_utilization.graph no
-    diskstats_iops.graph no
-
 [profitbricks-build9-amd64.debian.net]
     address 46.16.78.222
     use_node_name yes


=====================================
hosts/profitbricks-build7-amd64/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";


=====================================
hosts/profitbricks-build7-amd64/etc/mock/fedora-23-x86_64.cfg deleted
=====================================
@@ -1,51 +0,0 @@
-config_opts['root'] = 'fedora-23-x86_64'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['dist'] = 'fc23'  # only useful for --resultdir variable subst
-config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['releasever'] = '23'
-# this should be varied between 1st+2nd build:
-config_opts['macros']['%_smp_mflags'] = "-j8"
-
-config_opts['yum.conf'] = """
-[main]
-keepcache=1
-debuglevel=2
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-install_weak_deps=0
-metadata_expire=0
-
-# repos
-
-[fedora]
-name=fedora
-baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=$basearch
-failovermethod=priority
-#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
-#gpgcheck=1
-
-[updates]
-name=updates
-baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=$basearch
-failovermethod=priority
-#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
-#gpgcheck=1
-
-
-[reproducible-builds]
-name=reproducible-builds
-# dhiru's repository, see https://github.com/kholia/ReproducibleBuilds
-# this is the same person: dhiru = kholia = halfie
-baseurl=https://fedorapeople.org/~halfie/repository/
-enabled=1
-"""


=====================================
hosts/profitbricks-build7-amd64/etc/postfix/main.cf deleted
=====================================
@@ -1,41 +0,0 @@
-# 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 = profitbricks-build7-amd64.debian.net
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = profitbricks-build7-amd64.debian.net, localhost
-relayhost = 
-#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/profitbricks-build7-amd64/etc/schroot/default/fstab deleted
=====================================
@@ -1,24 +0,0 @@
-# fstab: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-/proc		/proc		none    rw,bind        0       0
-/sys		/sys		none    rw,bind        0       0
-/dev            /dev            none    rw,bind         0       0
-/dev/pts	/dev/pts	none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/srv/reproducible-results	/srv/reproducible-results	none	rw,bind		0	0
-#/srv/d-i	/srv/d-i	none	rw,bind		0	0
-/srv/jenkins	/srv/jenkins	none	rw,bind		0	0
-#/srv/live-build	/srv/live-build	none	rw,bind		0	0
-
-# It may be desirable to have access to /run, especially if you wish
-# to run additional services in the chroot.  However, note that this
-# may potentially cause undesirable behaviour on upgrades, such as
-# killing services on the host.
-#/run		/run		none	rw,bind		0	0
-#/run/lock	/run/lock	none	rw,bind		0	0
-/dev/shm	/dev/shm	none	rw,bind		0	0
-/run/shm	/run/shm	none	rw,bind		0	0


=====================================
hosts/profitbricks-build7-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/profitbricks-build7-amd64/etc/sudoers.d/jenkins deleted
=====================================
@@ -1,21 +0,0 @@
-jenkins ALL=  \
-	NOPASSWD: /usr/sbin/debootstrap *, \
-	/usr/bin/tee /schroots/*, \
-	/usr/bin/tee -a /schroots/*, \
-	/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
-	/bin/chmod +x /schroots/*, \
-	/bin/chmod +x /chroots/*, \
-	/usr/sbin/chroot /schroots/*, \
-	/bin/rm -rf --one-file-system /schroots/*, \
-	/bin/rm -rf --one-file-system /srv/live-build/*, \
-	/bin/mv /schroots/* /schroots/*, \
-	/bin/umount -l /schroots/*, \
-	/bin/mount --bind *, \
-	/usr/bin/killall timeout, \
-	/usr/sbin/slay 1111, \
-	/usr/sbin/slay 2222, \
-	/usr/sbin/slay jenkins, \
-	/bin/chmod -R a+rX /var/lib/libvirt/images
-
-# keep these environment variables
-Defaults        env_keep += "http_proxy", env_reset


=====================================
hosts/profitbricks-build7-amd64/etc/yum/repos.d/fedora-23-src.repo deleted
=====================================
@@ -1,7 +0,0 @@
-[fedora-23-src]
-name=fedora 23 sources
-baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/source/SRPMS
-enabled=1
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-


=====================================
hosts/profitbricks-build7-amd64/etc/yum/repos.d/fedora.repo deleted
=====================================
@@ -1,16 +0,0 @@
-[fedora]
-name=fedora
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=$basearch
-baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/
-failovermethod=priority
-#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
-#gpgcheck=1
-
-[updates]
-name=updates
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f23&arch=$basearch
-baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/updates/23/x86_64/
-failovermethod=priority
-#gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-fedora-23-primary
-#gpgcheck=1
-


=====================================
hosts/profitbricks-build7-amd64/etc/yum/repos.d/reproducible.repo deleted
=====================================
@@ -1,6 +0,0 @@
-[reproducible-builds]
-name=reproducible-builds
-# dhiru's repository, see https://github.com/kholia/ReproducibleBuilds
-# this is the same person: dhiru = kholia = halfie
-baseurl=https://fedorapeople.org/~halfie/repository/
-enabled=1


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -324,7 +324,7 @@
                 - 'profitbricks4':  { my_arch: 'amd64' }
                 - 'profitbricks5':  { my_arch: 'amd64' }
                 - 'profitbricks6':  { my_arch: 'i386'  }
-                - 'profitbricks7':  { my_arch: 'amd64' }
+                - 'osuosl168':  { my_arch: 'amd64' }
                 - 'profitbricks9':  { my_arch: 'amd64' }
                 - 'profitbricks10': { my_arch: 'amd64' }
                 - 'profitbricks11': { my_arch: 'amd64' }
@@ -386,7 +386,7 @@
                 - 'profitbricks4':  { my_arch: 'amd64' }
                 - 'profitbricks5':  { my_arch: 'amd64' }
                 - 'profitbricks6':  { my_arch: 'i386'  }
-                - 'profitbricks7':  { my_arch: 'amd64' }
+                - 'osuosl168':  { my_arch: 'amd64' }
                 - 'profitbricks9':  { my_arch: 'amd64' }
                 - 'profitbricks10': { my_arch: 'amd64' }
                 - 'profitbricks11': { my_arch: 'amd64' }
@@ -692,7 +692,7 @@
                 - 'setup_fdroid_build_environment':
                     my_description: 'Setup a build environment for F-Droid.'
                     my_timed: '42 0 * * 1'
-                    my_hname: 'profitbricks7'
+                    my_hname: 'osuosl168'
                     my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org bubu at bubu1.eu'
                     my_blocker: '^reproducible.*fdroid.*'
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
@@ -705,7 +705,7 @@
                 - 'fdroid_test':
                     my_description: 'Run tests on all the built APKs for F-Droid.'
                     my_timed: '42 23 1 1 *'
-            my_hname: 'profitbricks7'
+            my_hname: 'osuosl168'
             my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org'
             my_blocker: '^reproducible_fdroid.*'
             my_gitrepo: 'https://gitlab.com/fdroid/fdroidserver.git'


=====================================
update_jdn.sh
=====================================
@@ -116,7 +116,7 @@ user_host_groups['phil','jenkins']="$sudo_groups"
 user_host_groups['lunar','jenkins']='reproducible'
 user_host_groups['lynxis','profitbricks-build3-amd64']="$sudo_groups"
 user_host_groups['lynxis','profitbricks-build4-amd64']="$sudo_groups"
-user_host_groups['hans','profitbricks-build7-amd64']="$sudo_groups"
+user_host_groups['hans','osuosl-build168-amd64']="$sudo_groups"
 user_host_groups['vagrant','armhf']="$sudo_groups"
 user_host_groups['vagrant','arm64']="$sudo_groups"
 
@@ -158,7 +158,7 @@ sudo mkdir -p /srv/workspace
 [ -h /chroots ] || sudo ln -s /srv/workspace/chroots /chroots
 [ -h /schroots ] || sudo ln -s /srv/schroots /schroots
 
-if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "profitbricks-build7-amd64" ] ; then
+if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "osuosl-build168-amd64" ] ; then
 	# jenkins needs access to libvirt
 	sudo adduser jenkins kvm
 	sudo adduser jenkins libvirt
@@ -294,7 +294,7 @@ if [ -f /etc/debian_version ] ; then
 			"
 		# install squid on a few nodes only
 		case $HOSTNAME in
-			profitbricks-build1-a*|profitbricks-build10*|profitbricks-build7*|codethink-sled16*|osuosl-build167*) DEBS="$DEBS
+			profitbricks-build1-a*|profitbricks-build10*|codethink-sled16*|osuosl-build167*) DEBS="$DEBS
 				squid" ;;
 			*) ;;
 		esac
@@ -355,7 +355,7 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		# needed to run fdroid jobs
 		case $HOSTNAME in
-			profitbricks-build7-amd64) DEBS="$DEBS
+			osuosl-build168-amd64) DEBS="$DEBS
 				androguard/stretch-backports
 				android-sdk
 				bzr
@@ -580,7 +580,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then
 	cd /etc/munin/plugins
 	sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets forks open_files users nfs* iostat_ios ntp* 2>/dev/null
 	case $HOSTNAME in
-			profitbricks-build7*|profitbricks-build1-a*|profitbricks-build10*|codethink-sled16*|osuosl-build167*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
+			profitbricks-build1-a*|profitbricks-build10*|codethink-sled16*|osuosl-build167*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
 			*)	;;
 	esac
 	case $HOSTNAME in
@@ -699,7 +699,7 @@ fi
 #
 # generate the kgb-client configurations
 #
-if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "profitbricks-build7-amd64" ] || [ "$HOSTNAME" = "profitbricks-build2-i386" ] || [ "$HOSTNAME" = "profitbricks-build12-i386" ] ; then
+if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "osuosl-build168-amd64" ] || [ "$HOSTNAME" = "profitbricks-build2-i386" ] || [ "$HOSTNAME" = "profitbricks-build12-i386" ] ; then
 	cd $BASEDIR
 	KGB_SECRETS="/srv/jenkins/kgb/secrets.yml"
 	if [ -f "$KGB_SECRETS" ] && [ $(stat -c "%a:%U:%G" "$KGB_SECRETS") = "640:jenkins-adm:jenkins-adm" ] ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/34a9e2bb408308b5661b94a1212d6c67529d574d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/34a9e2bb408308b5661b94a1212d6c67529d574d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190119/8352d838/attachment-0001.html>

More information about the Qa-jenkins-scm mailing list