[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: d-i: sort the lang list
Mattia Rizzolo
gitlab at salsa.debian.org
Mon Jan 18 06:15:01 GMT 2021
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
6bc3a37d by Mattia Rizzolo at 2021-01-18T07:05:54+01:00
d-i: sort the lang list
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
9dac44cc by Mattia Rizzolo at 2021-01-18T07:07:07+01:00
d-i: add Kabyle to the list of languages
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
41cdcf10 by Mattia Rizzolo at 2021-01-18T07:14:28+01:00
d-i: make the script pass flake8.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
1 changed file:
- job-cfg/d-i.yaml.py
Changes:
=====================================
job-cfg/d-i.yaml.py
=====================================
@@ -7,31 +7,32 @@
import sys
import os
-from yaml import load, dump
+from yaml import dump
try:
- from yaml import CLoader as Loader, CDumper as Dumper
+ from yaml import CDumper as Dumper
except ImportError:
- from yaml import Loader, Dumper
+ from yaml import Dumper
langs = [
{'ca': {'langname': 'Catalan'}},
{'cs': {'langname': 'Czech'}},
- {'de': {'langname': 'German'}},
- {'en': {'langname': 'English'}},
- {'fr': {'langname': 'French'}},
- {'it': {'langname': 'Italian'}},
- {'pt_BR': {'langname': 'Brazilian Portuguese'}},
{'da': {'langname': 'Danish'}},
+ {'de': {'langname': 'German'}},
{'el': {'langname': 'Greek'}},
+ {'en': {'langname': 'English'}},
{'es': {'langname': 'Spanish'}},
{'fi': {'langname': 'Finnish'}},
+ {'fr': {'langname': 'French'}},
{'hu': {'langname': 'Hungarian'}},
+ {'it': {'langname': 'Italian'}},
{'ja': {'langname': 'Japanese'}},
+ {'kab': {'langname': 'Kabyle'}},
{'ko': {'langname': 'Korean'}},
{'nb': {'langname': 'Norwegian Bokmål'}},
{'nl': {'langname': 'Dutch'}},
{'nn': {'langname': 'Norwegian Nynorsk'}},
{'pt': {'langname': 'Portuguese'}},
+ {'pt_BR': {'langname': 'Brazilian Portuguese'}},
{'ro': {'langname': 'Romanian'}},
{'ru': {'langname': 'Russian'}},
{'sv': {'langname': 'Swedish'}},
@@ -207,7 +208,7 @@ def publ(fmt=None, trigger=None, irc=None, po=None):
if trigger is not None:
proj = ['d-i_manual_{lang}_pdf']
if po:
- proj.append(po)
+ proj.append(po)
p = [{'trigger': {'project': '_'.join(proj),
'threshold': 'UNSTABLE'}}]
p.extend([
@@ -221,6 +222,7 @@ def publ(fmt=None, trigger=None, irc=None, po=None):
'latest-only': True}})
return p
+
# make the yaml a bit shorter, with aliases
# if that's unhelpful move the variables inside prop()
sb_about = {
@@ -238,7 +240,8 @@ di_throttle = {
'max-per-node': 10,
'enabled': 'true',
'option': 'category',
- 'categories': [ 'd-i' ]}}
+ 'categories': ['d-i']}}
+
def prop(type='manual', priority=None):
p = [sb_about,
@@ -291,6 +294,7 @@ def jobspec_manual(key, name, desc, defaults=None,
j['logrotate'] = lr(logkeep)
return {key: j}
+
def gen_default(name, downstream=None, envfile=None, parameters=None):
builders = [{'shell': '/srv/jenkins/bin/d-i_build.sh'}]
if envfile is not None:
@@ -298,8 +302,8 @@ def gen_default(name, downstream=None, envfile=None, parameters=None):
if downstream is not None:
builders.append({'trigger-builds': downstream})
desc = ('Builds Debian packages in sid from git {branchdesc}, '
- 'triggered by pushes to <pre>{gitrepo}</pre> '
- '{do_not_edit}')
+ 'triggered by pushes to <pre>{gitrepo}</pre> '
+ '{do_not_edit}')
ret = {'defaults': {
'name': name,
@@ -315,6 +319,7 @@ def gen_default(name, downstream=None, envfile=None, parameters=None):
'publishers': publ(irc='debian-boot')}}
return ret
+
# -- here we build the data to be dumped as yaml
data = []
@@ -366,7 +371,13 @@ data.append(
'name': '{name}_check_jenkins_jobs',
'description': 'Checks daily for missing jenkins jobs. {do_not_edit}',
'triggers': [{'timed': '23 0 * * *'}],
- 'builders': [{'shell': '{0} "{1}" "{2}"'.format('/srv/jenkins/bin/d-i_check_jobs.sh', ':'.join(non_po_langs), ':'.join(non_pdf_langs))}],
+ 'builders': [{
+ 'shell': '{0} "{1}" "{2}"'.format(
+ '/srv/jenkins/bin/d-i_check_jobs.sh',
+ ':'.join(non_po_langs),
+ ':'.join(non_pdf_langs)
+ )
+ }],
'publishers': [
{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules',
'unstable-on-warning': 'true',
@@ -392,7 +403,7 @@ data.append(
{'job-group': {
'name': '{name}_manual_html_group',
'jobs': ['{name}_manual_{lang}_html'],
- 'lang': [l for l in langs if list(l.keys())[0] in non_po_langs],
+ 'lang': [lg for lg in langs if list(lg.keys())[0] in non_po_langs],
'trg': 'H/15 18 * * *',
'fmt': 'html',
'popath': ''}})
@@ -401,9 +412,9 @@ data.append(
{'job-group': {
'name': '{name}_manual_pdf_group',
'jobs': ['{name}_manual_{lang}_pdf'],
- 'lang': [l for l in langs
- if (list(l.keys())[0] not in non_pdf_langs)
- and (list(l.keys())[0] in non_po_langs)],
+ 'lang': [lg for lg in langs
+ if (list(lg.keys())[0] not in non_pdf_langs)
+ and (list(lg.keys())[0] in non_po_langs)],
'trg': '',
'fmt': 'pdf'}})
@@ -411,7 +422,7 @@ data.append(
{'job-group': {
'name': '{name}_manual_html_po2xml_group',
'jobs': ['{name}_manual_{lang}_html_po2xml'],
- 'lang': [l for l in langs if list(l.keys())[0] not in non_po_langs],
+ 'lang': [lg for lg in langs if list(lg.keys())[0] not in non_po_langs],
'trg': 'H/30 17 * * *',
'fmt': 'html',
'popath': '/po'}})
@@ -420,9 +431,9 @@ data.append(
{'job-group': {
'name': '{name}_manual_pdf_po2xml_group',
'jobs': ['{name}_manual_{lang}_pdf_po2xml'],
- 'lang': [l for l in langs
- if (list(l.keys())[0] not in non_pdf_langs)
- and (list(l.keys())[0] not in non_po_langs)],
+ 'lang': [lg for lg in langs
+ if (list(lg.keys())[0] not in non_pdf_langs)
+ and (list(lg.keys())[0] not in non_po_langs)],
'trg': '',
'fmt': 'pdf'}})
@@ -437,8 +448,6 @@ data.append(
'trg': 'H/1 19 * * *',
'pkg': pkgs}})
-
-
data.append(
{'project': {
'name': 'd-i',
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e76942f334dbb9abf86179c6ccb66da5de84f857...41cdcf1053bce4bb769a528632cd660a5ca78152
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e76942f334dbb9abf86179c6ccb66da5de84f857...41cdcf1053bce4bb769a528632cd660a5ca78152
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/20210118/356b85ba/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list