autoproj-jenkins 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76925129ddd7a23a712d931c92b8cd1632874e7
-  data.tar.gz: f92d1d6d73dd1f4fa1f1f5b828ac5fbc8764b46c
+  metadata.gz: c16584cd015cf6cda734340b1421dd940c0652b2
+  data.tar.gz: d7b82f5f9d3398b166babf3ae7fd97a48591787d
 SHA512:
-  metadata.gz: 983d0a01ad5d473f377a00c35f28b23f66e3a10346933d87ecf0e57acdfa2e6bdf3378caf0c8d0f81cac07689f6341d88f1a1e7767d1d4fee48d3845f913a1c1
-  data.tar.gz: e009d2b0f3c01cfac30a43fa17e037e56716c1c3e829509d6aef86e61166fc08eb85a35ce57ab7ac32b4fb1a62ce8406419c63d4c16216752498d07b8821409e
+  metadata.gz: 89b551757ed8cd0d5af08e790d62b1d4d272d93287fbcffec8cbad01c44b4b6fc00ba7eae0f4332acf1878d91de3b3372bf2c021e02b945e4c1a0d639c9551fc
+  data.tar.gz: cd7b67e167176d41508fd690bad3c861f440e8d46b2b827d5db3b08bc43c0a934e2c5bf285170aae8d19cd490a6cdc444f09c9d0e830766170de4a96ea7536eb

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

@@ -11,6 +11,7 @@ writeFile file: 'seed.yml', text: config
 dir('dev') {
     sh "ruby ../autoproj_install --skip-stage2 --seed-config=../seed.yml --gems-path=${env.JENKINS_HOME}/cache/gems --gemfile=../Gemfile"
     <%= render_template("import-#{vcs.type}.pipeline",
+                        poll: poll,
                         patch: false,
                         allow_unused: true,
                         package_dir: 'autoproj',

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

@@ -5,7 +5,7 @@ node(label: 'autoproj-jenkins') {
     def autoproj = "${fullWorkspaceDir}/dev/.autoproj/bin/autoproj"
 
     stage('bootstrap') {
-        <%= render_template('bootstrap.pipeline', vcs: vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
+        <%= render_template('bootstrap.pipeline', poll: true, vcs: vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
     }
 
     dir('dev') {

data/lib/autoproj/jenkins/templates/import-git.pipeline.erb

@@ -8,7 +8,7 @@ dir('<%= package_dir %>') {
     <% if credentials
            arg_credentials = "credentialsId: '#{credentials.jenkins_id}', "
        end %>
-    <%= vcs.type %> <%= arg_credentials %> <%= Hash[url: vcs.url].merge(vcs.options).map { |k, v| "#{k}: '#{v}'" }.join(", ") %>
+    <%= vcs.type %> poll: poll, <%= arg_credentials %> <%= Hash[url: vcs.url].merge(vcs.options).map { |k, v| "#{k}: '#{v}'" }.join(", ") %>
     <% if patch %>
     sh "${autoproj} patch ."
     <% end %>

data/lib/autoproj/jenkins/templates/import-svn.pipeline.erb

@@ -5,7 +5,7 @@ dir('<%= package_dir %>') {
         sh "${autoproj} unpatch ."
     }
     <% end %>
-    svn url: '<%= vcs.url %>'
+    svn url: '<%= vcs.url %>', poll: poll
     <% if patch %>
     sh "${autoproj} patch ."
     <% end %>

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

@@ -9,10 +9,13 @@ def triggeredByUpstream = false
 def upstreamBuilds = []
 
 stage('waiting for upstream jobs to finish') {
-    triggeredByUpstream = (currentBuild.rawBuild.getCause(hudson.model.Cause$UpstreamCause) != null)
     def triggerBuild    = getTriggerBuild(currentBuild)
-    if (!triggerBuild) {
-        triggerBuild = [null, null]
+    if (triggerBuild) {
+        triggeredByUpstream = true;
+    }
+    else {
+        triggeredByUpstream = false;
+        triggerBuild = [null, null];
     }
     upstreamBuilds = getUpstreamBuilds(upstreamJobNames, triggerBuild[0], triggerBuild[1])
 
@@ -30,7 +33,7 @@ node(label: 'autoproj-jenkins') {
     def upstreamPackagePrefixes = null
 
     stage('bootstrap') {
-        <%= render_template('bootstrap.pipeline', vcs: buildconf_vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
+        <%= render_template('bootstrap.pipeline', poll: false, vcs: buildconf_vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
 
         def jenkins_dependency_overrides = "<%= render_template 'jenkins_dependency_overrides.rb', escape: true, package_name: package_name, upstream_jobs: upstream_jobs %>"
         writeFile file: 'dev/autoproj/overrides.d/99_jenkins_dependency_overrides.rb',
@@ -52,6 +55,7 @@ node(label: 'autoproj-jenkins') {
     dir('dev') {
         stage('prepare build') {
             <%= render_template("import-#{vcs.type}.pipeline",
+                                poll: true,
                                 patch: true,
                                 allow_unused: true,
                                 package_dir: package_dir,

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.1"
+        VERSION = "0.3.2"
     end
 end

metadata

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