[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Arch Linux: refactoring

[Holger Levsen (@holger)]

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


Commits:
cd80289e by Holger Levsen at 2022-09-14T13:32:25+02:00
reproducible Arch Linux: refactoring

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

- - - - -
777f89e3 by Holger Levsen at 2022-09-14T13:41:36+02:00
reproducible: update documentation how we use our OSUOSL nodes

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

- - - - -


5 changed files:

- README.infrastructure
- THANKS.head
- bin/reproducible_build_archlinux_pkg.sh
- bin/reproducible_common.sh
- bin/reproducible_html_nodes_info.sh


Changes:

=====================================
README.infrastructure
=====================================
@@ -51,7 +51,7 @@ The nodes are used for these jobs:
 * osuosl171: openwrt, coreboot, netbsd
 ** is constantly online (in jenkins) now, which is not how we like it and still doesnt solve the netbsd job probs
 * osuosl172: openwrt, coreboot (future)
-* osuosl173: debian/archlinux rebuilder#1 / live-builds
+* osuosl173: Debian live-builds / bootstrap jobs
 * osuosl174: bwiedemann: opensuse tests, vagrant: ocasional manual tests
 * osuosl184: archlinux, alpine
 


=====================================
THANKS.head
=====================================
@@ -44,8 +44,8 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
   ** 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 used for building OpenWrt, coreboot and NetBSD for t.r-b.o
   ** 32 cores with 144 GB memory for osuosl172-amd64.debian.net used for building OpenWrt, coreboot 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
+  ** 32 cores with 144 GB memory for osuosl173-amd64.debian.net used for building Debian live builds for t.r-b.o
+  ** 32 cores with 144 GB memory for osuosl174-amd64.debian.net used for build tests for openSUSE
 
 ==== Past sponsors
 


=====================================
bin/reproducible_build_archlinux_pkg.sh
=====================================
@@ -393,9 +393,9 @@ choose_package
 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="osuosl184-amd64"
-N2="osuosl170-amd64"
+# currently there are two Arch Linux build nodes…
+N1="$ARCH_BUILD_NODE1"
+N2="$ARCH_BUILD_NODE2"
 # if random number between 0 and 99 is greater than 60…
 # (because osuosl184 is generally less loaded than osuosl170)
 if [ $(( ( $RANDOM % 100 ) )) -gt 60 ] ; then


=====================================
bin/reproducible_common.sh
=====================================
@@ -65,6 +65,8 @@ ALPINE_BASE="$BASE/alpine"
 ARCHLINUX_REPOS="core extra multilib community"
 ARCHLINUX_PKGS=/srv/reproducible-results/archlinux_pkgs
 ARCHBASE=$BASE/archlinux
+ARCH_BUILD_NODE1="osuosl184-amd64"
+ARCH_BUILD_NODE2="osuosl170-amd64"
 
 # common settings for testing rpm based distros
 RPM_BUILD_NODE=osuosl171-amd64


=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -27,7 +27,7 @@ explain_nodes() {
 		osuosl170)	write_page "<br /><small>(r-b Alpine, Archlinux builds)</small>" ;;
 		osuosl171)	write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
 		osuosl172)	write_page "<br /><small>(r-b OpenWrt, Coreboot builds)</small>" ;;
-		osuosl173)	write_page "<br /><small>(r-b Debian / Archlinux rebuilder)</small>" ;;
+		osuosl173)	write_page "<br /><small>(r-b Debian live-build / bootstrap jobs)</small>" ;;
 		osuosl174)	write_page "<br /><small>(r-b openSUSE)</small>" ;;
 		ionos1)		write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
 		codethink16)	write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a0bf7ce958573d8a903cabc2791e8a2db511cf1b...777f89e3f8f15b3e155911ae34d4f4087451997f

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a0bf7ce958573d8a903cabc2791e8a2db511cf1b...777f89e3f8f15b3e155911ae34d4f4087451997f
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/20220914/89550091/attachment-0001.htm>