autoproj-jenkins 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13427e987c3febc7e624223036980f880e26ff88
-  data.tar.gz: bf1a748ad8934c0c9241c9bcdf090e6e727e8164
+  metadata.gz: 0132b94c0223a1db8bcaab4146282050916ddae3
+  data.tar.gz: cd04e661a532ac47e2fc59f1e9b64bd40dde2fe8
 SHA512:
-  metadata.gz: 7c157abf2efb15131f8d7d0f42a04f9f76eb98c66ee52ee5119c9dbc3968c2fa472f38735e3b050b9189eeb9ef9ad53d96226e22a66e76bb93b64e65d0e1fa2d
-  data.tar.gz: 88270bb3df102fe38b1ce637782492d1221afd31f9608db2ef504f5456b1cecf28770ec0ff58a4224b131f8837470c86310d5f4b14b1e77a933e7313704b8cd3
+  metadata.gz: c1581f62df24d74ef13051068edc893ee9e234e15ce2f2323028e338399082781c4fe732e505973dd6bcabd1666d155d3a50286c4c1ef6488a2f48ec6d240b18
+  data.tar.gz: af067ebd48a27f8dd322f40a020cfb619517e37d2964d77f7d3092ba07e06301b1f169af24c594400e9fe629958fcd47d28ac0d808080fc2c7c7aecb1f524f7b

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

@@ -106,16 +106,20 @@ def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
 
 def waitForUpstreamBuilds(upstreamBuilds)
 {
-    while(true)
+    // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
+    for (upstreamBuildIndex = 0; upstreamBuildIndex < upstreamBuilds.size(); ++upstreamBuildIndex)
     {
-        // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
-        for (upstreamBuildIndex = 0; upstreamBuildIndex < upstreamBuilds.size(); ++upstreamBuildIndex)
+        def entry = upstreamBuilds[upstreamBuildIndex]
+        def upstreamJobName = entry[0]
+        def upstreamBuildId = entry[1]
+        while (true)
         {
-            def entry = upstreamBuilds[upstreamBuildIndex]
-            def upstreamJobName = entry[0]
-            def upstreamBuildId = entry[1]
             def status = isUpstreamOK(upstreamJobName, upstreamBuildId)
-            if (status == 'IN_PROGRESS')
+            if (status == 'OK')
+            {
+                break
+            }
+            else if (status == 'IN_PROGRESS')
             {
                 echo "waiting for job ${upstreamJobName}#${upstreamBuildId} to finish"
                 sleep 10
@@ -126,8 +130,8 @@ def waitForUpstreamBuilds(upstreamBuilds)
                 return false
             }
         }
-        return true
     }
+    return true
 }
 
 def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.10"
+        VERSION = "0.3.11"
     end
 end

metadata

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