autoproj-jenkins 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a826cadbfc992eccc000270afcc1fecd50c1830b
-  data.tar.gz: ee4da54f79e11947705c523708751a54af2cbe3f
+  metadata.gz: 969cc56758574ee4b7ddd8bdd562eeae8ebf75e5
+  data.tar.gz: 416f2fbec3a7eb9af37e9f984e40622866768a2d
 SHA512:
-  metadata.gz: c3930b48986b612053a3c17563f07bd14530b07e7e40675dd96989bafc18dbd4401f4738e1d4e8ab99b13ee7aab52401178df6738c7d5f1d9880542bcaf07901
-  data.tar.gz: 8ff38f153e335b7fb80677efaaf2d60a5f8e770e1b31cb9c7589da2fc2be2b5a3416335556ec1437990a4745acd06b565d10f85326cd174cf55b444c1a8533c4
+  metadata.gz: 64fe5ee3d0356da58a95e2a4939c6a899c0259285c467a939762355cfa1f9fd8cbade179d5dd5e5373ffbbe98ff69a0f3b1f52b706136bb25e4ac37b1e99a31f
+  data.tar.gz: 4ee18ef2acae430c90c49910f356a19b7a6c9f4cc228596737b3b5c8621d09035634a9558df837de75f0680379667f869c5d0920e33ffff6ddd39ce366d44fcc

data/lib/autoproj/jenkins/templates/library.pipeline.erb

@@ -100,8 +100,7 @@ def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
 
 def waitForUpstreamBuilds(upstreamBuilds)
 {
-    def skipBuild = false;
-    waitUntil
+    while(true)
     {
         // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
         for (upstreamBuildIndex = 0; upstreamBuildIndex < upstreamBuilds.size(); ++upstreamBuildIndex)
@@ -113,19 +112,17 @@ def waitForUpstreamBuilds(upstreamBuilds)
             if (status == 'IN_PROGRESS')
             {
                 echo "waiting for job ${upstreamJobName}#${upstreamBuildId} to finish"
-                return false;
+                sleep 10
             }
             else if (status == 'FAILED')
             {
                 echo "${upstreamJobName}#${upstreamBuildId} did not finish successfully, aborting this build"
-                skipBuild = true;
-                return true;
+                return false
             }
         }
-        return true;
     }
 
-    return !skipBuild
+    return true
 }
 
 def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.8"
+        VERSION = "0.3.9"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client