Fixed JCloudsBuildWrapper behavior with multiple build steps

jenkinsci · May 18, 2017 · 8a7c350 · 8a7c350
1 parent cfc531f
commit 8a7c350
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsBuildWrapper.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsBuildWrapper.java
@@ -137,18 +137,16 @@ public NodePlan apply(InstancesToRun instance) {
                 MoreExecutors.listeningDecorator(Computer.threadPoolForRemoting), logger, terminateNodes);
 
         final Iterable<RunningNode> runningNodes = provisioner.apply(nodePlans);
+        final JCloudsCloud waitCloud = waitPhoneHome(runningNodes, listener.getLogger());
+        if (null != waitCloud) {
+            waitCloud.phoneHomeWaitAll();
+        }
 
         return new Environment() {
-            private JCloudsCloud waitCloud = null;
-
             @Override
             public void buildEnvVars(Map<String, String> env) {
                 List<String> ips = getInstanceIPs(runningNodes, listener.getLogger());
                 env.put("JCLOUDS_IPS", Util.join(ips, ","));
-                waitCloud = waitPhoneHome(runningNodes, listener.getLogger());
-                if (null != waitCloud) {
-                    waitCloud.phoneHomeWaitAll();
-                }
             }
 
             @Override