Merge pull request #83 from svanoort/reset-to-core-2.76

Revert "Merge pull request #82" - restores cleanup code that requires core 2.76
jenkinsci · Oct 30, 2018 · cf74887 · cf74887
2 parents d26a0ea + 860827b
commit cf74887
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -42,8 +42,6 @@
 import hudson.model.BuildListener;
 import hudson.model.Executor;
 import hudson.model.Item;
-import hudson.model.ParameterValue;
-import hudson.model.ParametersAction;
 import hudson.model.Queue;
 import hudson.model.Result;
 import hudson.model.Run;
@@ -470,13 +468,6 @@ public void doKill() {
                 nodeProperty.buildEnvVars(env, listener);
             }
         }
-        // TODO EnvironmentContributingAction does not support Job yet:
-        ParametersAction a = getAction(ParametersAction.class);
-        if (a != null) {
-            for (ParameterValue v : a) {
-                v.buildEnvironment(this, env);
-            }
-        }
 
         EnvVars.resolve(env);
         return env;