autoproj-jenkins 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9afd4f75a51180a1dd207eb9eca50d88f00f0e1f
-  data.tar.gz: 0198294a97c41882de344d9eccf632b8c46b2a43
+  metadata.gz: 76ebc8d50e5283f36c0898480889013c8c3da5b3
+  data.tar.gz: 514d13bd43cdc4dc00aed8627197244898e1eeec
 SHA512:
-  metadata.gz: 7412607e70eb73a2678c456dc6bb89901c774238c65dd69c561611a8b92512e05a62e609baa8a58cacdfe17b785d536fb0c2005f0c9409c4d38491f609f6c672
-  data.tar.gz: b8fcf1f5730ced0d390df61457855e859055ad361d873988410fa32040c707a7094fc268dab087e41127bc126ca050fd2a3112699d35330eb9efe3cb34b1cfe9
+  metadata.gz: 820ad5b828f8bce136c9052b3c807577a0c1ce520dddafc3d09d9dcda648138d13afd520a18c338b94a0116a385078f6bb72293ef240ac0b169b92f056c34b8c
+  data.tar.gz: 6345557039b3ab9a432e26e5f0abbad807d0656ccb348e5ddb15a97cdecc183b6bfc35ca466691988425dc36d30100ece6a102fc8b4bc6f0fd94b974b1e28551

data/lib/autoproj/cli/jenkins.rb

@@ -33,8 +33,11 @@ module Autoproj
                     autoproj_install_path = nil
                 end
 
-                finalize_setup(package_names, recursive: false, non_imported_packages: :return)
-                updater.create_or_update_buildconf_job(*package_names, gemfile: gemfile,
+                source_packages, _ = finalize_setup(package_names, recursive: false, non_imported_packages: :return)
+                source_packages = source_packages.map do |package_name|
+                    ws.manifest.package_definition_by_name(package_name)
+                end
+                updater.create_or_update_buildconf_job(*source_packages, gemfile: gemfile,
                                                        autoproj_install_path: autoproj_install_path, dev: dev,
                                                        credentials_id: credentials_id,
                                                        vcs_credentials: parse_vcs_credentials(vcs_credentials))

data/lib/autoproj/jenkins/server.rb

@@ -49,6 +49,11 @@ module Autoproj::Jenkins
             end
         end
 
+        # Render a pipeline script
+        def render_pipeline(job_name, template, **parameters)
+            Autoproj::Jenkins.render_template(template, **parameters)
+        end
+
         # Test whether the server already has a job
         #
         # @param [String] job_name

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

@@ -83,7 +83,13 @@ def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
                 else {
                     echo "manual build trigger, using last successful build for ${jobName}"
                 }
-                matchingBuild = job.getLastSuccessfulBuild().getNumber()
+                if (job.getLastSuccessfulBuild())
+                    matchingBuild = job.getLastSuccessfulBuild().getNumber()
+                else
+                {
+                    echo "${jobName} has no successful build, aborting"
+                    return;
+                }
             }
             echo "upstream build: ${jobName}#${matchingBuild}"
             upstreamBuilds << [jobName, matchingBuild]
@@ -94,11 +100,9 @@ def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
 
 def waitForUpstreamBuilds(upstreamBuilds)
 {
-    def waitContinue = true;
-    while(waitContinue)
+    def skipBuild = false;
+    waitUntil
     {
-        waitContinue = false;
-
         // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
         for (upstreamBuildIndex = 0; upstreamBuildIndex < upstreamBuilds.size(); ++upstreamBuildIndex)
         {
@@ -109,19 +113,27 @@ def waitForUpstreamBuilds(upstreamBuilds)
             if (status == 'IN_PROGRESS')
             {
                 echo "waiting for job ${upstreamJobName}#${upstreamBuildId} to finish"
-                waitContinue = true
-                sleep time: 1, units: 'SECONDS'
+                return false;
             }
             else if (status == 'FAILED')
             {
                 echo "${upstreamJobName}#${upstreamBuildId} did not finish successfully, aborting this build"
-                currentBuild.result = 'NOT_BUILT';
-                return false;
+                skipBuild = true;
+                return true;
             }
         }
+        return true;
     }
-    return true
 
+    if (skipBuild)
+    {
+        currentBuild.result = 'NOT_BUILT';
+        return false;
+    }
+    else
+    {
+        return true;
+    }
 }
 
 def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,

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

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

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

@@ -4,7 +4,7 @@
     <description></description>
     <keepDependencies>false</keepDependencies>
     <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.9">
-        <script />
+        <script><%= pipeline %></script>
         <sandbox>false</sandbox>
     </definition>
     <triggers/>

data/lib/autoproj/jenkins/updater.rb

@@ -147,13 +147,6 @@ module Autoproj::Jenkins
         def update(*packages, quiet_period: 5, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, vcs_credentials: Credentials.new)
             reverse_dependencies = ws.manifest.compute_revdeps
 
-            packages.each do |package|
-                job_name = job_name_from_package_name(package.name)
-                server.create_or_reset_job(
-                    job_name, 'package.xml',
-                    quiet_period: quiet_period)
-            end
-
             package_names = packages.map(&:name).to_set
             packages.map do |package|
                 job_name = job_name_from_package_name(package.name)
@@ -161,7 +154,7 @@ module Autoproj::Jenkins
                     raise UnhandledVCS, "the #{package.vcs.type} importer, used by #{package.name}, is not supported by autoproj-jenkins"
                 end
 
-                upstream_jobs = compute_job_to_package_map(compute_upstream_packages(package), package_names)
+                upstream_jobs   = compute_job_to_package_map(compute_upstream_packages(package), package_names)
                 downstream_jobs = compute_job_to_package_map(compute_downstream_packages(package, reverse_dependencies), package_names)
 
                 prefix_relative_path =
@@ -172,7 +165,7 @@ module Autoproj::Jenkins
                         "install/#{package.name}"
                     end
 
-                server.update_job_pipeline(job_name, 'package.pipeline',
+                pipeline = server.render_pipeline(job_name, 'package.pipeline',
                     buildconf_vcs: ws.manifest.vcs,
                     vcs: package.vcs,
                     package_name: package.name,
@@ -185,6 +178,11 @@ module Autoproj::Jenkins
                     autoproj_install_path: autoproj_install_path,
                     vcs_credentials: vcs_credentials)
 
+                server.create_or_reset_job(
+                    job_name, 'package.xml',
+                    pipeline: pipeline,
+                    quiet_period: quiet_period)
+
                 job_name
             end
         end

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.3"
+        VERSION = "0.3.4"
     end
 end

metadata

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