summaryrefslogtreecommitdiffstats
path: root/job-cfg
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-07-18 16:49:32 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-18 19:59:18 +0200
commitcaddb4ca0178aab639af04c2fe9ff1cedc8863d0 (patch)
tree9ddd577a73fc2a16ea40ffcc8b05353b12f5e70b /job-cfg
parentaf7115a39adaff5c397c9a1adebb7752487d1814 (diff)
downloadjenkins.debian.net-caddb4ca0178aab639af04c2fe9ff1cedc8863d0.tar.xz
d-i: only trigger lvc_debian-miniiso after a triggered d-i build
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'job-cfg')
-rwxr-xr-xjob-cfg/d-i.yaml.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index f1b477c2..864a0da9 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -192,11 +192,10 @@ if "jenkins-test-vm" == os.uname()[1]:
jobs = [ '{name}_build-group', '{name}_pu-build-group']
# add a special job for triggering from the pu/ branches
-jobs.append( {'{name}_{act}_{pkg}': {
+jobs.append( {'{name}_pu-triggered_{pkg}': {
'gitrepo': 'git://git.debian.org/git/d-i/{pkg}',
'branchdesc': 'master branch',
'branch': 'origin/master',
- 'act': 'pu-triggered',
'pkg': 'debian-installer',
'trg': None,
}} )
@@ -379,19 +378,21 @@ for f in ['html', 'pdf']:
logkeep=90))
templs.append(jtmpl(act='manual', target='{lang}', fmt=f, po=po))
-data.append(gen_default(
- name='{name}-{act}',
- downstream=[{'project': 'lvc_debian-miniiso', 'current-parameters': 'true'}],
- parameters=[ {'string': {'name': 'TRIGGERING_BRANCH', 'description': 'git branch that triggered the build that resulted in this subsequent build.'}}],
- ))
+data.append(gen_default( name='{name}-{act}'))
data.append(gen_default(
name='{name}-pu-{act}',
downstream=[{'project': 'd-i_pu-triggered_debian-installer','predefined-parameters': 'TRIGGERING_BRANCH=$OUR_BRANCH'}],
envfile='env.txt',
))
+data.append(gen_default(
+ name='{name}-pu-triggered',
+ downstream=[{'project': 'lvc_debian-miniiso', 'current-parameters': 'true'}],
+ parameters=[ {'string': {'name': 'TRIGGERING_BRANCH', 'description': 'git branch that triggered the build that resulted in this subsequent build.'}}],
+ ))
templs.append(jtmpl(act='{act}', target='{pkg}'))
templs.append(jtmpl(act='pu-{act}', target='{pkg}'))
+templs.append(jtmpl(act='pu-triggered', target='{pkg}'))
data.extend(templs)
data.append(