autoproj-jenkins 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b068687531e0f0b3783cbe4b2fd95a62ec28c0
-  data.tar.gz: 4a1d865d39359263e886c881e470cdcd53c41af4
+  metadata.gz: a79fa49f8d46242936996f1c0fe7650a60e11ab4
+  data.tar.gz: 02033a5d2c85b32336cc9ab0aa9988147622b1a9
 SHA512:
-  metadata.gz: 94bebe22fed809b955a8b387908ee823455e25a2e80c3ac9a53a02998de9553eada1cfd83b8e661b25d7a3378b046af8f83c613d2232a6aa0ea9ba744190aae2
-  data.tar.gz: 2cb32c59bb218aaa6c741bc896f548290c505c6c217772b5c4ea152daf5a69cd87cbc2a59b6d0c90cc04f3fcfa55ea939cb98452fe7e4875572ca701eb1d26f0
+  metadata.gz: ed9114e1004fca7fc12295ebf65375bc510cdfdc2db2c354a58ff943a32aad516883bab10e5eba9a4faaa19c5431c192ed6356719ad02fc14a156b1d89d8aa7d
+  data.tar.gz: ce7cd0242e7687349399fb8c93a4f723c739bda3d2a840f2391aba262a037aa5b83d5f336233cd79ef7341d309667ba41796af298becdcdcefc7e68de551b8d4

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

@@ -125,15 +125,7 @@ def waitForUpstreamBuilds(upstreamBuilds)
         return true;
     }
 
-    if (skipBuild)
-    {
-        currentBuild.result = 'NOT_BUILT';
-        return false;
-    }
-    else
-    {
-        return true;
-    }
+    return !skipBuild
 }
 
 def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,

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

@@ -18,13 +18,14 @@ stage('waiting for upstream jobs to finish') {
         triggerBuild = [null, null];
     }
 
-    def upstreamBuilds = getUpstreamBuilds(upstreamJobNames, triggerBuild[0], triggerBuild[1])
+    upstreamBuilds = getUpstreamBuilds(upstreamJobNames, triggerBuild[0], triggerBuild[1])
     if (!upstreamBuilds)
     {
         currentBuild.result = 'NOT_BUILT';
         return;
     }
     if (!waitForUpstreamBuilds(upstreamBuilds)) {
+        currentBuild.result = 'NOT_BUILT';
         return
     }
 }

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.6"
+        VERSION = "0.3.7"
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sylvain Joyeux