[Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: create and update unstable+exp pbuilder base systems on armhf again

Holger Levsen (@holger) gitlab at salsa.debian.org
Mon Mar 25 15:56:36 GMT 2024



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


Commits:
abc342ba by Holger Levsen at 2024-03-25T16:47:46+01:00
reproducible Debian: create and update unstable+exp pbuilder base systems on armhf again

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

- - - - -
f488c2ca by Holger Levsen at 2024-03-25T16:53:52+01:00
reproducible Debian: schedule unstable & experimental on armhf again

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

- - - - -


3 changed files:

- bin/reproducible_maintenance.sh
- bin/reproducible_scheduler.py
- bin/reproducible_setup_pbuilder.sh


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -592,12 +592,12 @@ if [ -n "$http_proxy" ] ; then
 	pbuilder_http_proxy="--http-proxy $http_proxy"
 fi
 for s in $SUITES ; do
-	if [ "$s" = "unstable" ] || [ "$s" = "experimental" ] ; then
-		if [ "$ARCH" = "armhf" ];  then
-			echo temporarly skipping "$s/$ARCH"
-			continue
-		fi
-	fi
+	#if [ "$s" = "unstable" ] || [ "$s" = "experimental" ] ; then
+	#	if [ "$ARCH" = "armhf" ];  then
+	#		echo temporarly skipping "$s/$ARCH"
+	#		continue
+	#	fi
+	#fi
 	for i in osuosl ionos4 ionos7 ionos9 ionos10 ionos14; do
 		if [ "${HOSTNAME:0:${#i}}" = "$i" ]; then
 			# this node is not used to do Debian rebuilds, skip it all


=====================================
bin/reproducible_scheduler.py
=====================================
@@ -113,7 +113,7 @@ LIMITS = {
             'bullseye': {1: (900, 100), 2: (1300, 100), '*': 50},
             'bookworm': {1: (900, 100), 2: (1300, 100), '*': 50},
             'trixie': {1: (900, 400), 2: (1300, 300), '*': 100},
-            'unstable': {1: (1000, 400), 2: (1300, 300), '*': 150},
+            'unstable': {1: (900, 400), 2: (1300, 300), '*': 150},
             'experimental': {1: (800, 400), 2: (1300, 300), '*': 50},
         },
         'arm64': {
@@ -126,9 +126,9 @@ LIMITS = {
         'armhf': {
             'bullseye': {1: (900, 100), 2: (1400, 100), '*': 50},
             'bookworm': {1: (900, 100), 2: (1400, 100), '*': 50},
-            'trixie': {1: (900, 600), 2: (1400, 400), '*': 100},
-            'unstable': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'experimental': {1: (900, 0), 2: (1400, 0), '*': 0},
+            'trixie': {1: (1000, 600), 2: (1400, 400), '*': 100},
+            'unstable': {1: (1000, 600), 2: (1400, 400), '*': 150},
+            'experimental': {1: (1000, 500), 2: (1400, 300), '*': 50},
         },
     },
     'ftbfs': {
@@ -156,9 +156,9 @@ LIMITS = {
         'armhf': {
             'bullseye': {1: (900, 0), 2: (1400, 0), '*': 0},
             'bookworm': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'trixie': {1: (900, 20), 2: (1400, 10), '*': 5},
-            'unstable': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'experimental': {1: (900, 0), 2: (1400, 0), '*': 0},
+            'trixie': {1: (1000, 30), 2: (1400, 15), '*': 5},
+            'unstable': {1: (1000, 30), 2: (1400, 15), '*': 2},
+            'experimental': {1: (1000, 20), 2: (1400, 10), '*': 2},
         }
     },
     'depwait': {
@@ -187,8 +187,8 @@ LIMITS = {
             'bullseye': {1: (900, 200), 2: (1400, 100), '*': 0},
             'bookworm': {1: (900, 200), 2: (1400, 100), '*': 0},
             'trixe': {1: (900, 400), 2: (1400, 200), '*': 5},
-            'unstable': {1: (900, 0), 2: (1400, 0), '*': 0},
-            'experimental': {1: (900, 0), 2: (1400, 0), '*': 0},
+            'unstable': {1: (900, 400), 2: (1400, 200), '*': 5},
+            'experimental': {1: (900, 400), 2: (1400, 200), '*': 2},
         }
     },
     'old': {
@@ -217,8 +217,8 @@ LIMITS = {
             'bullseye': {1: (900, 0), 2: (1400, 0), '*': 0},
             'bookworm': {1: (1000, 0), 2: (1500, 0), '*': 0},
             'trixie': {1: (1000, 1000), 2: (1500, 750), '*': 0},
-            'unstable': {1: (1000, 0), 2: (1500, 0), '*': 0},
-            'experimental': {1: (1000, 0), 2: (1500, 0), '*': 0},
+            'unstable': {1: (1000, 1000), 2: (1500, 750), '*': 0},
+            'experimental': {1: (1000, 90), 2: (1500, 65), '*': 0},
         }
     }
 }


=====================================
bin/reproducible_setup_pbuilder.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2024 Holger Levsen <holger at layer-acht.org>
 #         © 2018-2023 Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv2
 
@@ -19,14 +19,13 @@ else
 	SUITE="$1"
 fi
 
-ARCH=$(dpkg --print-architecture)
-
-if [ "$SUITE" = "unstable" ] || [ "$SUITE" = "experimental" ] ; then
-	if [ "$ARCH" = "armhf" ];  then
-		echo temporarly skipping "$SUITE/$ARCH"
-		exit 0
-	fi
-fi
+#ARCH=$(dpkg --print-architecture)
+#if [ "$SUITE" = "unstable" ] || [ "$SUITE" = "experimental" ] ; then
+#	if [ "$ARCH" = "armhf" ];  then
+#		echo temporarly skipping "$SUITE/$ARCH"
+#		exit 0
+#	fi
+#fi
 
 #
 # create script to configure a pbuilder chroot



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5ea2d1f4a05f284ddcaaafa542a8f5da0982708b...f488c2caf8f20b3e4a105811313b1a2aaf477b07

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5ea2d1f4a05f284ddcaaafa542a8f5da0982708b...f488c2caf8f20b3e4a105811313b1a2aaf477b07
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/20240325/b4e1affc/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list