summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-06-20 20:37:35 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-20 20:47:38 +0200
commit2ad58121ff5367f6c08e4907a8cec220099f76db (patch)
tree62e72b7b3625f90530ee0395aeeee947b1826fc2
parent9b3fc7b35c0cb23cd29daa8bd9edd64aae1d9d0a (diff)
downloadjenkins.debian.net-2ad58121ff5367f6c08e4907a8cec220099f76db.tar.xz
Revert "d-i: make it possible to specify the git branch by hand for pu/ jobs"
This reverts commit a531fdc4021f7ed5ee4b89c9e5f980f8373cd5f0.
-rwxr-xr-xjob-cfg/d-i.yaml.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index 1494d499..73283a55 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -389,14 +389,13 @@ data.extend(
'branches': ['{branch}']}}],
'builders': [ {'shell': '/srv/jenkins/bin/d-i_build.sh'},
{'trigger-builds': [{'project': 'd-i_pu-triggered_debian-installer',
+ 'current-parameters': 'true',
'predefined-parameters': 'PU_GIT_BRANCH=$GIT_BRANCH'
},
]}
],
'project-type': 'freestyle',
'properties': prop(type='packages', priority=99),
- 'parameters': [{'string': {'name': 'GIT_BRANCH',
- 'description': 'The git branch to act upon -- this should normally come from an SCM/GIT trigger'}}],
'logrotate': lr(90),
'publishers': publ(irc='debian-boot')}}])