[JENKINS-49635] Support new VirtualFile.toExternalURL API

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.0-beta-3</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(jenkinsVersions: [null, '2.32.3'])
+buildPlugin()

pom.xml

@@ -28,12 +28,12 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.2</version>
+        <version>3.15</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-basic-steps</artifactId>
-    <version>2.8-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <packaging>hpi</packaging>
     <name>Pipeline: Basic Steps</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Basic+Steps+Plugin</url>
@@ -47,7 +47,7 @@
         <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
         <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-      <tag>HEAD</tag>
+        <tag>${scmTag}</tag>
   </scm>
     <repositories>
         <repository>
@@ -62,11 +62,15 @@
         </pluginRepository>
     </pluginRepositories>
     <properties>
-        <jenkins.version>2.7.3</jenkins.version>
-        <java.level>7</java.level>
-        <workflow-step-api-plugin.version>2.13</workflow-step-api-plugin.version>
+        <revision>2.8</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <jenkins.version>2.121.1</jenkins.version>
+        <java.level>8</java.level>
+        <workflow-step-api-plugin.version>2.15</workflow-step-api-plugin.version>
         <workflow-cps-plugin.version>2.32</workflow-cps-plugin.version>
         <workflow-support-plugin.version>2.14</workflow-support-plugin.version>
+        <workflow-api-plugin.version>2.28</workflow-api-plugin.version>
+        <useBeta>true</useBeta>
     </properties>
     <dependencies>
         <dependency>
@@ -89,18 +93,17 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.16</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jenkins-ci.plugins</groupId>
-                    <artifactId>scm-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${workflow-api-plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
-            <version>1.6</version>
+            <version>1.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>apache-httpcomponents-client-4-api</artifactId>
+            <version>4.5.5-3.0</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -194,5 +197,12 @@
             <version>2.8</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-api</artifactId>
+            <version>${workflow-api-plugin.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/org/jenkinsci/plugins/workflow/steps/ArtifactUnarchiverStep.java

@@ -4,6 +4,7 @@
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.model.Run;
+import hudson.model.TaskListener;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
@@ -45,7 +46,7 @@ public String getDisplayName() {
         }
 
         @Override public Set<? extends Class<?>> getRequiredContext() {
-            return ImmutableSet.of(FilePath.class, Run.class);
+            return ImmutableSet.of(FilePath.class, Run.class, TaskListener.class);
         }
 
     }

src/main/java/org/jenkinsci/plugins/workflow/steps/ArtifactUnarchiverStepExecution.java

@@ -4,19 +4,19 @@
 import hudson.AbortException;
 import hudson.FilePath;
 import hudson.model.Run;
+import hudson.model.TaskListener;
+import io.jenkins.plugins.httpclient.RobustHTTPClient;
 import jenkins.model.ArtifactManager;
 import jenkins.util.VirtualFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-/**
- * @author Kohsuke Kawaguchi
- */
 public class ArtifactUnarchiverStepExecution extends SynchronousNonBlockingStepExecution<List<FilePath>> {
 
     @SuppressFBWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="Only used when starting.")
@@ -34,6 +34,7 @@ public class ArtifactUnarchiverStepExecution extends SynchronousNonBlockingStepE
     protected List<FilePath> run() throws Exception {
         // where to copy artifacts from?
         Run<?, ?> r = getContext().get(Run.class); // TODO consider an option to override this (but in what format?)
+        TaskListener listener = getContext().get(TaskListener.class);
 
         ArtifactManager am = r.getArtifactManager();
 
@@ -50,21 +51,26 @@ protected List<FilePath> run() throws Exception {
                 if (dst.isDirectory())
                     dst = dst.child(getFileName(all[0]));
 
-                files.add(copy(am.root().child(all[0]), dst));
+                files.add(copy(am.root().child(all[0]), dst, listener));
             } else {
                 // copy into a directory
                 for (String path : all) {
-                    files.add(copy(am.root().child(path), dst.child(path)));
+                    files.add(copy(am.root().child(path), dst.child(path), listener));
                 }
             }
         }
 
         return files;
     }
 
-    private FilePath copy(VirtualFile src, FilePath dst) throws IOException, InterruptedException {
-        try (InputStream in = src.open()) {
-            dst.copyFrom(in);
+    private FilePath copy(VirtualFile src, FilePath dst, TaskListener listener) throws IOException, InterruptedException {
+        URL u = src.toExternalURL();
+        if (u != null) {
+            new RobustHTTPClient().copyFromRemotely(dst, u, listener);
+        } else {
+            try (InputStream in = src.open()) {
+                dst.copyFrom(in);
+            }
         }
         return dst;
     }

src/main/java/org/jenkinsci/plugins/workflow/support/steps/stash/StashStep.java

@@ -25,8 +25,10 @@
 package org.jenkinsci.plugins.workflow.support.steps.stash;
 
 import com.google.common.collect.ImmutableSet;
+import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
+import hudson.Launcher;
 import hudson.Util;
 import hudson.model.Run;
 import hudson.model.TaskListener;
@@ -110,7 +112,7 @@ public static class Execution extends SynchronousNonBlockingStepExecution<Void>
         }
 
         @Override protected Void run() throws Exception {
-            StashManager.stash(getContext().get(Run.class), step.name, getContext().get(FilePath.class), getContext().get(TaskListener.class), step.includes, step.excludes,
+            StashManager.stash(getContext().get(Run.class), step.name, getContext().get(FilePath.class), getContext().get(Launcher.class), getContext().get(EnvVars.class), getContext().get(TaskListener.class), step.includes, step.excludes,
                     step.useDefaultExcludes, step.allowEmpty);
             return null;
         }
@@ -128,7 +130,7 @@ public static class Execution extends SynchronousNonBlockingStepExecution<Void>
         }
 
         @Override public Set<? extends Class<?>> getRequiredContext() {
-            return ImmutableSet.of(Run.class, FilePath.class, TaskListener.class);
+            return ImmutableSet.of(Run.class, FilePath.class, Launcher.class, EnvVars.class, TaskListener.class);
         }
 
         @Override public String argumentsToString(Map<String, Object> namedArgs) {

src/main/java/org/jenkinsci/plugins/workflow/support/steps/stash/UnstashStep.java

@@ -26,8 +26,10 @@
 
 import com.google.common.collect.ImmutableSet;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
+import hudson.Launcher;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import java.util.Set;
@@ -71,7 +73,7 @@ public static class Execution extends SynchronousNonBlockingStepExecution<Void>
         }
 
         @Override protected Void run() throws Exception {
-            StashManager.unstash(getContext().get(Run.class), name, getContext().get(FilePath.class), getContext().get(TaskListener.class));
+            StashManager.unstash(getContext().get(Run.class), name, getContext().get(FilePath.class), getContext().get(Launcher.class), getContext().get(EnvVars.class), getContext().get(TaskListener.class));
             return null;
         }
 
@@ -88,7 +90,7 @@ public static class Execution extends SynchronousNonBlockingStepExecution<Void>
         }
 
         @Override public Set<? extends Class<?>> getRequiredContext() {
-            return ImmutableSet.of(Run.class, FilePath.class, TaskListener.class);
+            return ImmutableSet.of(Run.class, FilePath.class, Launcher.class, EnvVars.class, TaskListener.class);
         }
 
     }

src/test/java/org/jenkinsci/plugins/workflow/steps/ArtifactArchiverStepTest.java

@@ -1,22 +1,26 @@
 package org.jenkinsci.plugins.workflow.steps;
 
 import java.util.Arrays;
+import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.util.VirtualFile;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jenkinsci.plugins.workflow.DirectArtifactManagerFactory;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
-import org.junit.Assert;
+import static org.junit.Assert.*;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
-/**
- * @author Kohsuke Kawaguchi
- */
-public class ArtifactArchiverStepTest extends Assert {
+public class ArtifactArchiverStepTest {
+
+    @ClassRule public static BuildWatcher watcher = new BuildWatcher();
+
     @Rule public JenkinsRule j = new JenkinsRule();
 
     /**
@@ -74,5 +78,18 @@ public void archive() throws Exception {
         j.assertLogContains("one/two", b);
     }
 
-}
+    @Issue("JENKINS-49635")
+    @Test
+    public void directDownload() throws Exception {
+        ArtifactManagerConfiguration.get().getArtifactManagerFactories().add(new DirectArtifactManagerFactory());
+        j.createSlave("remote1", null, null);
+        j.createSlave("remote2", null, null);
+        WorkflowJob p = j.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("node('remote1') {writeFile file: 'x', text: 'contents'; archiveArtifacts 'x'}; node('remote2') {unarchive mapping: [x: 'x']; echo(/loaded ${readFile('x')}/)}", true));
+        DirectArtifactManagerFactory.whileBlockingOpen(() -> {
+            j.assertLogContains("loaded contents", j.buildAndAssertSuccess(p));
+            return null;
+        });
+    }
 
+}

src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java

@@ -40,7 +40,6 @@
 import hudson.model.Run;
 import hudson.model.Slave;
 import hudson.model.TaskListener;
-import hudson.slaves.CommandLauncher;
 import hudson.slaves.ComputerLauncher;
 import hudson.slaves.NodeProperty;
 import hudson.slaves.RetentionStrategy;