[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "reproducible Debian: stop testing stretch"
Holger Levsen
gitlab at salsa.debian.org
Thu Jan 16 17:08:15 GMT 2020
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
1a6da4f8 by Holger Levsen at 2020-01-16T18:01:36+01:00
Revert "reproducible Debian: stop testing stretch"
This reverts commit 80fdeb72ad60bfaf9870ac9186353f0d4af855fa.
- - - - -
d7186e4f by Holger Levsen at 2020-01-16T18:08:00+01:00
reproducible Debian: disable scheduling of packages for stretch
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
2 changed files:
- TODO
- bin/reproducible_scheduler.py
Changes:
=====================================
TODO
=====================================
@@ -155,8 +155,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
=== Debian reproducible builds
-* stop testing stretch while preserving old results
-** TODO: remove special casing of stretch in scheduler...
* get rid off "set -x # # to debug diffoscoppe/schroot problems"
** add check if package to be build has been blacklisted since scheduling and abort
** on SIGTERM, also cleanup on remote build nodes there! (via ssh &)
=====================================
bin/reproducible_scheduler.py
=====================================
@@ -73,24 +73,28 @@ MAXIMA = {'amd64': 2000, 'i386': 1600, 'arm64': 2000, 'armhf': 1800}
LIMITS = {
'untested': {
'amd64': {
+ 'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
'i386': {
+ 'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
'arm64': {
+ 'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
'unstable': {'*': 255},
'experimental': {'*': 255},
},
'armhf': {
+ 'stretch': {'*': 255},
'buster': {'*': 255},
'bullseye': {'*': 255},
'unstable': {'*': 255},
@@ -99,24 +103,28 @@ LIMITS = {
},
'new': {
'amd64': {
+ 'stretch': {1: (1000, 500), 2: (1500, 750), '*': 100},
'buster': {1: (1000, 500), 2: (1500, 750), '*': 100},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (1000, 500), 2: (1500, 750), '*': 250},
'experimental': {1: (1000, 500), 2: (1500, 750), '*': 50},
},
'i386': {
+ 'stretch': {1: (800, 500), 2: (1300, 750), '*': 100},
'buster': {1: (800, 500), 2: (1300, 750), '*': 100},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (800, 500), 2: (1300, 750), '*': 250},
'experimental': {1: (800, 500), 2: (1300, 750), '*': 50},
},
'arm64': {
+ 'stretch': {1: (1000, 500), 2: (1500, 750), '*': 50},
'buster': {1: (1000, 500), 2: (1500, 750), '*': 50},
'bullseye': {1: (1000, 500), 2: (1500, 750), '*': 150},
'unstable': {1: (1000, 500), 2: (1500, 750), '*': 125},
'experimental': {1: (1000, 500), 2: (1500, 750), '*': 25},
},
'armhf': {
+ 'stretch': {1: (900, 400), 2: (1400, 600), '*': 50},
'buster': {1: (900, 400), 2: (1400, 600), '*': 50},
'bullseye': {1: (900, 400), 2: (1400, 600), '*': 75},
'unstable': {1: (900, 400), 2: (1400, 600), '*': 150},
@@ -125,24 +133,28 @@ LIMITS = {
},
'ftbfs': {
'amd64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 40), 2: (1500, 20), '*': 5},
'bullseye': {1: (1000, 40), 2: (1500, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1500, 20), '*': 2},
},
'i386': {
+ 'stretch': {1: (1000, 0), 2: (1300, 0), '*': 0},
'buster': {1: (1000, 40), 2: (1300, 20), '*': 5},
'bullseye': {1: (1000, 40), 2: (1500, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1300, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1300, 20), '*': 2},
},
'arm64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 40), 2: (1500, 20), '*': 5},
'bullseye': {1: (1000, 40), 2: (1500, 20), '*': 5},
'unstable': {1: (1000, 40), 2: (1500, 20), '*': 5},
'experimental': {1: (1000, 40), 2: (1500, 20), '*': 2},
},
'armhf': {
+ 'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
'buster': {1: (900, 20), 2: (1400, 10), '*': 5},
'bullseye': {1: (900, 20), 2: (1400, 10), '*': 5},
'unstable': {1: (900, 20), 2: (1400, 10), '*': 5},
@@ -151,24 +163,28 @@ LIMITS = {
},
'depwait': {
'amd64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 400), 2: (1500, 200), '*': 50},
'bullseye': {1: (1000, 400), 2: (1500, 200), '*': 50},
'unstable': {1: (1000, 400), 2: (1500, 200), '*': 50},
'experimental': {1: (1000, 400), 2: (1500, 200), '*': 20},
},
'i386': {
+ 'stretch': {1: (800, 0), 2: (1300, 0), '*': 0},
'buster': {1: (800, 400), 2: (1300, 200), '*': 50},
'bullseye': {1: (1000, 400), 2: (1500, 200), '*': 50},
'unstable': {1: (800, 400), 2: (1300, 200), '*': 50},
'experimental': {1: (800, 400), 2: (1300, 200), '*': 20},
},
'arm64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 400), 2: (1500, 200), '*': 50},
'bullseye': {1: (1000, 400), 2: (1500, 200), '*': 50},
'unstable': {1: (1000, 400), 2: (1500, 200), '*': 50},
'experimental': {1: (1000, 400), 2: (1500, 200), '*': 20},
},
'armhf': {
+ 'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
'buster': {1: (900, 200), 2: (1400, 100), '*': 50},
'bullseye': {1: (900, 200), 2: (1400, 100), '*': 50},
'unstable': {1: (900, 200), 2: (1400, 100), '*': 50},
@@ -177,24 +193,28 @@ LIMITS = {
},
'old': {
'amd64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 100), 2: (1500, 85), '*': 0},
'bullseye': {1: (1000, 1000), 2: (1500, 850), '*': 0},
'unstable': {1: (1000, 1200), 2: (1500, 1050), '*': 0},
'experimental': {1: (1000, 70), 2: (1500, 50), '*': 0},
},
'i386': {
+ 'stretch': {1: (800, 0), 2: (1300, 0), '*': 0},
'buster': {1: (800, 100), 2: (1300, 85), '*': 0},
'bullseye': {1: (1000, 1000), 2: (1500, 850), '*': 0},
'unstable': {1: (800, 1200), 2: (1300, 1050), '*': 0},
'experimental': {1: (800, 70), 2: (1300, 50), '*': 0},
},
'arm64': {
+ 'stretch': {1: (1000, 0), 2: (1500, 0), '*': 0},
'buster': {1: (1000, 100), 2: (1500, 85), '*': 0},
'bullseye': {1: (1000, 1000), 2: (1500, 850), '*': 0},
'unstable': {1: (1000, 1200), 2: (1500, 1050), '*': 0},
'experimental': {1: (1000, 70), 2: (1500, 50), '*': 0},
},
'armhf': {
+ 'stretch': {1: (900, 0), 2: (1400, 0), '*': 0},
'buster': {1: (900, 80), 2: (1400, 50), '*': 0},
'bullseye': {1: (900, 800), 2: (1400, 500), '*': 0},
'unstable': {1: (900, 1000), 2: (1400, 700), '*': 0},
@@ -706,9 +726,7 @@ def scheduler(arch):
# (but keep the view ordering everywhere else)
priotized_suite_order = ['unstable']
for suite in SUITES:
- if suite == 'stretch':
- continue
- if suite not in priotized_suite_order:
+ if suite not in priotized_suite_order:
priotized_suite_order.append(suite)
for suite in priotized_suite_order:
query = "SELECT count(*) " \
@@ -757,8 +775,6 @@ def scheduler(arch):
if __name__ == '__main__':
log.info('Updating sources tables for all suites.')
for suite in SUITES:
- if suite == 'stretch':
- continue
update_sources(suite)
log.info('Sources for suite %s done at %s.', suite, datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
purge_old_pages()
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/80fdeb72ad60bfaf9870ac9186353f0d4af855fa...d7186e4fcffa694eeb91cba5cee24634aee2c0b3
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/80fdeb72ad60bfaf9870ac9186353f0d4af855fa...d7186e4fcffa694eeb91cba5cee24634aee2c0b3
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/20200116/c9a7d543/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list