Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit 9d5a748

Browse files
author
Bernhard Grünewaldt
committed
fix env vars not passed by buildTrigger.
1 parent 00bbc09 commit 9d5a748

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/main/java/io/codeclou/jenkins/githubwebhookbuildtriggerplugin/GithubWebhookBuildTriggerAction.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
import com.google.gson.Gson;
88
import com.google.gson.JsonSyntaxException;
9-
import hudson.EnvVars;
109
import hudson.Extension;
1110
import hudson.model.*;
12-
import hudson.model.queue.QueueTaskFuture;
1311
import hudson.util.HttpResponses;
1412
import io.codeclou.jenkins.githubwebhookbuildtriggerplugin.config.GithubWebhookBuildTriggerPluginBuilder;
1513
import io.codeclou.jenkins.githubwebhookbuildtriggerplugin.webhooksecret.GitHubWebhookUtility;
1614
import jenkins.model.Jenkins;
1715
import org.apache.commons.io.IOUtils;
1816
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
19-
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
2017
import org.kohsuke.stapler.HttpResponse;
2118
import org.kohsuke.stapler.StaplerRequest;
2219
import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -29,7 +26,7 @@
2926
import java.util.Collection;
3027

3128
@Extension
32-
public class GithubWebhookBuildTriggerAction implements UnprotectedRootAction, EnvironmentContributingAction {
29+
public class GithubWebhookBuildTriggerAction implements UnprotectedRootAction {
3330

3431
@Override
3532
public String getUrlName() {
@@ -123,8 +120,7 @@ public HttpResponse doReceive(HttpServletRequest request, StaplerRequest stapler
123120
WorkflowJob wjob = (WorkflowJob) job;
124121
if (wjob.isBuildable()) {
125122
jobsTriggered.append(" WORKFLOWJOB> ").append(job.getName()).append(" TRIGGERED\n");
126-
wjob.addAction(environmentContributionAction.transform());
127-
wjob.scheduleBuild(0, cause);
123+
wjob.scheduleBuild2(0, environmentContributionAction.transform(), new CauseAction(cause));
128124
} else {
129125
jobsTriggered.append(" WORKFLOWJOB> ").append(job.getName()).append(" NOT BUILDABLE. SKIPPING.\n");
130126
}
@@ -170,8 +166,4 @@ private String getTextEnvelopedInBanner(String text) {
170166
return banner.toString();
171167
}
172168

173-
@Override
174-
public void buildEnvVars(AbstractBuild<?, ?> abstractBuild, EnvVars envVars) {
175-
176-
}
177169
}

0 commit comments

Comments
 (0)