Commit 2ddfd5b9 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible OpenWrt/coreboot/NetBSD: move to osuosl 171 & 172, from pb3 & pb4 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 7d4e095a

THANKS.head

+2 −4
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
 ** 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 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)
@@ -42,8 +40,8 @@ Debian packages for t.r-b.o 
  ** 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 osuosl171-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o

  ** 32 cores with 144 GB memory for osuosl172-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o

  ** 32 cores with 144 GB memory for osuosl173-amd64.debian.net

  ** 32 cores with 144 GB memory for osuosl174-amd64.debian.net

TODO

+9 −9
Original line number Diff line number Diff line
@@ -70,8 +70,10 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian 
*** inform #osuosl

** done: osuosl169: archlinux

** done: osuosl170: archlinux (future)

** osuosl171: openwrt, coreboot, netbsd, opensuse

** osuosl172: openwrt, coreboot, netbsd, opensuse (future)

** osuosl171: openwrt, coreboot, netbsd, FIXME: opensuse/redhat

*** was pb3

** osuosl172: openwrt, coreboot, netbsd, FIXME: opensuse/redhat (future)

*** was pb4

** osuosl173: debian

** osuosl174: debian (future)

* add to README
@@ -206,8 +208,8 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian 
==== reproducible non-Debian tests, new host for 398 day variation is unused



* locations in the code which need to be changed

** RPM_BUILD_NODE=profitbricks-build3-amd64

** grep for profitbricks-build3-amd64, there's more

** RPM_BUILD_NODE=osuosl-build171-amd64

** grep for osuosl-build171-amd64, there's more

* IOW: these tests should use it:

** coreboot

** netbsd
@@ -300,7 +302,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian 
* setup script:

** mock --clean just uninstalls the chroot but it'll still be rebuilt next time using cache.  you can delete the caches from /var/cache/mock/ or touch the mock config

** is /etc/yum/repos.d/fedora.repo really needed?

** hosts/pb-build3/etc/yum/repos.d/* is really not sooo good but works…

** hosts/osuosl-build171/etc/yum/repos.d/* is really not sooo good but works…

* build script

** cleanup mock cache between two builds: --scrub=all might be too much, but whats sensible (or is it --scrub=all?)?

** no variations introduced yet:
@@ -393,9 +395,7 @@ $ du -hd1 | sort -h | tail -n 6 


==== reproducible qubes



* dont forget: rm holger@profitbricks-build3-amd64:qubes-test/

* dont forget: rm userContent/qubes/q(1|2) on jenkins

* add qubes test on pb3 / t.r-b.o

* add qubes test on t.r-b.o

----

        git clone https://github.com/qubesos/qubes-builder

        make get-sources BUILDERCONF=scripts/travis-builder.conf COMPONENTS=installer-qubes-os
@@ -405,7 +405,7 @@ $ du -hd1 | sort -h | tail -n 6 


        make qubes iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os

----

* pb3 has been modified manually:  apt install createrepo python-yaml

* depends:  apt install createrepo python-yaml

* once this iso is being tested, it will be interesting to build the Qubes templates as well, as those images (Qubes templates are images) will be copied on the installation iso. the above iso is a stripped down iso without templates… (and not the real thing)



==== reproducible guix

bin/common-functions.sh

+2 −2
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ else 
	fi

	# force http_proxy as we want it

	case $HOSTNAME in

		jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build3*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)

		jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)

			# pb datacenter in karlsruhe uses pb1 as proxy:

			export http_proxy="http://78.137.99.97:3128" ;;

		profitbricks-build4*|profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)

		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" ;;

		osuosl*)

bin/jenkins_node_definitions.sh

+4 −3
Original line number Diff line number Diff line 
#!/bin/bash



# Copyright 2015-2018 Holger Levsen <holger@layer-acht.org>

# Copyright 2015-2019 Holger Levsen <holger@layer-acht.org>

# released under the GPLv=2



# define Debian build nodes in use for tests.reproducible-builds.org/debian/
@@ -9,7 +9,7 @@ 
#		  where it *must* only contain the Debian nodes as it's used

#		  to generate the variations… and

#		- bin/reproducible_cleanup_nodes.sh where it would be

#		  nice to also include pb-build3+4+7+9+10, to also cleanup

#		  nice to also include pb-build9+10, to also cleanup

#		  jobs there…

BUILD_NODES="bbx15-armhf-rb.debian.net

cb3a-armhf-rb.debian.net
@@ -137,7 +137,7 @@ get_node_ssh_port() { 
	  p64c*)

	    PORT=2248

	    ;;

	  profitbricks-build[456]*|profitbricks-build1[56]*)

	  profitbricks-build[56]*|profitbricks-build1[56]*)

	    NODE_RUN_IN_THE_FUTURE=true

	    PORT=22

	    ;;
@@ -189,6 +189,7 @@ get_node_ssh_port() { 
	    PORT=45050

	    ;;

	  osuosl-build172*)

	    NODE_RUN_IN_THE_FUTURE=true

	    PORT=45051

	    ;;

	  osuosl-build173*)

bin/reproducible_build_archlinux_pkg.sh

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ mkdir b1 b2 
N1="osuosl-build169-amd64"

N2="osuosl-build170-amd64"

# if random number between 0 and 99 is greater than 60…

# (because pb4 is generally less loaded than pb3)

# (because osuosl169 is generally less loaded than osuosl170)

if [ $(( ( $RANDOM % 100 ) )) -gt 60 ] ; then

	NODE1=$N1

	NODE2=$N2