Commit 193fb3a3 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Arch Linux: move build jobs to osuosl169 and osuosl170 



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

TODO

+3 −3
Original line number Diff line number Diff line
@@ -365,9 +365,9 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian 
** build in /srv/workspace instead of /tmp (once this has been done reduce /tmp size back to 15G)



* build on OSUOSL nodes:

** builds not moved yet

** not yet running in the future

** disable builds on old nodes

** confirm, this is working: not yet running in the future

** delete setup old jobs

** update thanks & readme



==== reproducible fdroid

bin/reproducible_build_archlinux_pkg.sh

+5 −5
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>

#                2017 kpcyrd <git@rxv.cc>

# released under the GPLv=2
@@ -125,7 +125,7 @@ first_build() { 
	local FUTURE_STATE="disabled"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"

	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"

	if [ "$(hostname)" = "profitbricks-build4-amd64" ] ; then

	if [ "$(hostname)" = "osuosl-build170-amd64" ] ; then

		FUTURE_STATE="enabled"

		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"

		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"
@@ -210,7 +210,7 @@ second_build() { 
	local FUTURE_STATE="disabled"

	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH' PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'"

	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"

	if [ "$(hostname)" = "profitbricks-build4-amd64" ] ; then

	if [ "$(hostname)" = "osuosl-build170-amd64" ] ; then

		FUTURE_STATE="enabled"

		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"

		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"
@@ -385,8 +385,8 @@ mkdir -p $BASE/archlinux/$REPOSITORY/$SRCPACKAGE 
# build package twice

mkdir b1 b2

# currently there are two Arch Linux build nodes… let's keep things simple

N1="profitbricks-build3-amd64"

N2="profitbricks-build4-amd64"

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)

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

bin/reproducible_common.sh

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

# vim: set noexpandtab:



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

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

#         © 2015-2018 Mattia Rizzolo <mattia@mapreri.org>

# released under the GPLv=2

#
@@ -532,6 +532,8 @@ write_variation_table() { 
		fi

		if [ "$1" != "FreeBSD" ] && [ "$1" != "Arch Linux" ] ; then

			write_page "<tr><td>year, month, date</td><td>today ($DATE)</td><td>same for both builds (currently, work in progress)</td></tr>"

		elif [ "$1" = "Arch Linux" ] ; then

			write_page "<tr><td>year, month, date</td><td>osuosl-build169-amd64: today ($DATE) or osuosl-build170-amd64: 398 days in the future ($FUTURE)</td><td>the other one</td></tr>"

		else

			write_page "<tr><td>year, month, date</td><td>profitbricks-build3-amd64: today ($DATE) or profitbricks-build4-amd64: 398 days in the future ($FUTURE)</td><td>the other one</td></tr>"

		fi

hosts/common/etc/rc.local

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ case $(hostname) in 
	profitbricks-build3*)	put_schroots_on_tmpfs ;;

	profitbricks-build4*)	put_schroots_on_tmpfs ;;

	profitbricks-build7*)	put_schroots_on_tmpfs ;;

	osuosl-build169*)	put_schroots_on_tmpfs ;;

	osuosl-build170*)	put_schroots_on_tmpfs ;;

	*)			;;

esac
@@ -103,6 +105,8 @@ case $(hostname) in 
	profitbricks-build6*)	send_back_to_the_future ;;

	profitbricks-build15*)	send_back_to_the_future ;;

	profitbricks-build16*)	send_back_to_the_future ;;

	osuosl-build169*)	send_back_to_the_future ;;

	osuosl-build170*)	send_back_to_the_future ;;

	*)			;;

esac

update_jdn.sh

+9 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ case $HOSTNAME in 
		# set correct date

		set_correct_date

		;;

	osuosl-build170-amd64)

		# set correct date

		set_correct_date

		;;

	*)	;;

esac
@@ -311,6 +315,7 @@ if [ -f /etc/debian_version ] ; then 
		case $HOSTNAME in

			profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) DEBS="$DEBS ntpdate" ;;

			codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) DEBS="$DEBS ntpdate" ;;

			osuosl-build170-amd64) DEBS="$DEBS ntpdate" ;;

			*) ;;

		esac

		# needed to run coreboot/openwrt/netbsd/fedora jobs
@@ -776,6 +781,10 @@ case $HOSTNAME in 
		disable_dsa_check_packages

		sudo date --set="+398 days +6 hours + 23 minutes"

		;;

	osuosl-build170-amd64)

		disable_dsa_check_packages

		sudo date --set="+398 days +6 hours + 23 minutes"

		;;

	jenkins)

		# notify irc on updates of jenkins.d.n

		MESSAGE="jenkins.d.n updated to $(cd $BASEDIR ; git describe --always)."