[Qa-jenkins-scm] [jenkins.debian.net] 02/02: Revert "d-i: make it possible to specify the git branch by hand for pu/ jobs"

Holger Levsen holger at layer-acht.org
Mon Jun 20 18:48:24 UTC 2016


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 2ad58121ff5367f6c08e4907a8cec220099f76db
Author: Philip Hands <phil at hands.com>
Date:   Mon Jun 20 20:37:35 2016 +0200

    Revert "d-i: make it possible to specify the git branch by hand for pu/ jobs"
    
    This reverts commit a531fdc4021f7ed5ee4b89c9e5f980f8373cd5f0.
---
 job-cfg/d-i.yaml.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index 1494d49..73283a5 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')}}])
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list