[FIXED JENKINS-16028] [FIXED JENKINS-18762] Adds EnvAction to hold CO…

…PYARTIFACT_BUILD_NUMBER_XXX when it's needed. It was added when a build starts and the build has copyartifact, which doesn't work for maven-project and copyartifacts wrapped in other builders.
jenkinsci · Oct 1, 2014 · 581c57e · 581c57e
1 parent 6ccfac8
commit 581c57e
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
@@ -289,9 +289,11 @@ public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListene
             }
             // Add info about the selected build into the environment
             EnvAction envData = build.getAction(EnvAction.class);
-            if (envData != null) {
-                envData.add(getItemGroup(build), expandedProject, src.getNumber());
+            if (envData == null) {
+                envData = new EnvAction();
+                build.addAction(envData);
             }
+            envData.add(getItemGroup(build), expandedProject, src.getNumber());
             if (target.length() > 0) targetDir = new FilePath(targetDir, env.expand(target));
             expandedFilter = env.expand(filter);
             if (expandedFilter.trim().length() == 0) expandedFilter = "**";
@@ -497,20 +499,6 @@ private static List<CopyArtifact> getCopiers(AbstractProject<?,?> project) throw
         }
     }
 
-    // Listen for new builds and add EnvAction in any that use CopyArtifact build step
-    @Extension
-    public static final class CopyArtifactRunListener extends RunListener<Build> {
-        public CopyArtifactRunListener() {
-            super(Build.class);
-        }
-
-        @Override
-        public void onStarted(Build r, TaskListener listener) {
-            if (((Build<?,?>)r).getProject().getBuildersList().get(CopyArtifact.class) != null)
-                r.addAction(new EnvAction());
-        }
-    }
-
     private static class EnvAction implements EnvironmentContributingAction {
         // Decided not to record this data in build.xml, so marked transient:
         private transient Map<String,String> data = new HashMap<String,String>();