Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-17862] multi step job generation doesn't work with multiple …
…calls
  • Loading branch information
syl20bnr authored and syl20bnr committed May 27, 2013
1 parent d33a187 commit 5b24600
Showing 1 changed file with 23 additions and 20 deletions.
43 changes: 23 additions & 20 deletions src/main/java/org/jenkinsci/plugins/jobgenerator/GeneratorRun.java
Expand Up @@ -406,32 +406,35 @@ public void cleanUp(BuildListener listener) throws Exception {
}
}
// parameterized build trigger build step
TriggerBuilder tb = job.getBuildersList().get(TriggerBuilder.class);
if (tb != null) {
for (ListIterator<BlockableBuildTriggerConfig> tbc =
tb.getConfigs().listIterator(); tbc.hasNext();) {
BuildTriggerConfig c = tbc.next();
for (AbstractProject p : c.getProjectList(job.getParent(),
null)) {
List<ParametersAction> importParams =
List<TriggerBuilder> tbl = job.getBuildersList().getAll(
TriggerBuilder.class);
if (tbl.size() > 0) {
for(TriggerBuilder tb: tbl){
for (ListIterator<BlockableBuildTriggerConfig> tbc =
tb.getConfigs().listIterator(); tbc.hasNext();) {
BuildTriggerConfig c = tbc.next();
for (AbstractProject p : c.getProjectList(
job.getParent(),null)) {
List<ParametersAction> importParams =
new ArrayList<ParametersAction>();
importParams.addAll(lpa);
List<AbstractBuildParameters> lbp = c.getConfigs();
for(AbstractBuildParameters bp: lbp){
if(bp.getClass().getSimpleName().equals(
"GeneratorKeyValueBuildParameters")){
importParams.add((ParametersAction)
bp.getAction(GeneratorRun.this, listener));
importParams.addAll(lpa);
List<AbstractBuildParameters> lbp = c.getConfigs();
for(AbstractBuildParameters bp: lbp){
if(bp.getClass().getSimpleName().equals(
"GeneratorKeyValueBuildParameters")){
importParams.add((ParametersAction)
bp.getAction(GeneratorRun.this,
listener));
}
}
job.copyOptions((JobGenerator) p);
Cause.UpstreamCause cause =
new Cause.UpstreamCause(getBuild());
p.scheduleBuild2(0, cause, importParams);
}
job.copyOptions((JobGenerator) p);
Cause.UpstreamCause cause = new Cause.UpstreamCause(
getBuild());
p.scheduleBuild2(0, cause, importParams);
}
}
}

// standard Jenkins dependencies
if(bt == null){
for(AbstractProject dp: job.getDownstreamProjects()){
Expand Down

0 comments on commit 5b24600

Please sign in to comment.