From b297a53fbb80c710343d1ed969f8fb04827e2921 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Mon, 11 May 2020 15:14:22 +0200 Subject: [PATCH 1/3] [JENKINS-62014] Add support for build step environment filters --- pom.xml | 6 +++--- .../workflow/steps/durable_task/DurableTaskStep.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f98eab59..08fb20a7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 3.54 + 4.1 org.jenkins-ci.plugins.workflow @@ -64,7 +64,7 @@ 2.36 -SNAPSHOT - 2.176.1 + 2.236-SNAPSHOT 8 true 2.20 @@ -79,7 +79,7 @@ org.jenkins-ci.plugins durable-task - 1.33 + 1.35-SNAPSHOT org.jenkins-ci.plugins.workflow diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java index 061b1bac..a720e0ae 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStep.java @@ -35,6 +35,7 @@ import hudson.init.Terminator; import hudson.model.Node; import hudson.model.Result; +import hudson.model.Run; import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.remoting.ChannelClosedException; @@ -302,6 +303,7 @@ static final class Execution extends AbstractStepExecutionImpl implements Runnab ws = context.get(FilePath.class); node = FilePathUtils.getNodeName(ws); DurableTask durableTask = step.task(); + durableTask.setRun(context.get(Run.class)); if (returnStdout) { durableTask.captureOutput(); } From 0928b7672b0d31871f050d70acdd7c30964505be Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Thu, 23 Jul 2020 14:55:35 +0200 Subject: [PATCH 2/3] Use released version of Jenkins (durable-task is still SNAPSHOT) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08fb20a7..08e459b2 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.36 -SNAPSHOT - 2.236-SNAPSHOT + 2.248 8 true 2.20 From 39bc1451a4c26b014a97d282127ab1b72dd81d64 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Thu, 23 Jul 2020 14:57:46 +0200 Subject: [PATCH 3/3] Depend on durable-task incremental --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08e459b2..35b3f240 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ org.jenkins-ci.plugins durable-task - 1.35-SNAPSHOT + 1.35-rc463.dbcd6297773f org.jenkins-ci.plugins.workflow