autoproj-jenkins 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49b6103056732ceec497949e398860b7440f301
-  data.tar.gz: 1e8b1caeb82b4c19e269950a697ce8c759ca9013
+  metadata.gz: a99e744847ba8cfabd0e714c65dc7d6a6687eac4
+  data.tar.gz: 877ed75c92c1df0124a75cb5035b740a681672a0
 SHA512:
-  metadata.gz: b1f67ea6b8ec14662ef56b7801e9eaa8d4f6250b9c9bcfecf45fc622a0219fbb89e0af6e8106e17e4f7fe9675fa8b9cd5c74f56815c68518ad9b3fc440e602e7
-  data.tar.gz: 1dede042a4c91c8d73659cca3b37f2c69ad00a2510d76aa3a4aa0eb295e5f3d12f95067703bf0b7494db7a8c7f729bd2c5dd98aa10e76b214c77098204233496
+  metadata.gz: 7935345cd7e706ef5e57024994284263ac89243b89831df79e3dbb4c9bcaecf62bc641695e81e868a49b80170cef2b4e6dc2f08c8a96e7216b60aa9175bd53f5
+  data.tar.gz: 4a93f5d6394cd1ce958fec195a408adb7e9ffe72fd4d3c268028be8a41be53f61ff209c8f6f329c7a428e2bd4be507d45bd4db86965c7ad38c14761949580286

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

@@ -1,4 +1,3 @@
-def fullWorkspaceDir = pwd()
 env.HOME = fullWorkspaceDir
 <% if autoproj_install_path %>
 sh 'cp -f "<%= autoproj_install_path %>" ./autoproj_install'
@@ -23,5 +22,4 @@ dir('dev') {
     sh ".autoproj/bin/aup autoproj/ --force-reset"
 }
 
-def autoproj = "${fullWorkspaceDir}/dev/.autoproj/bin/autoproj"
 env.AUTOPROJ_CURRENT_ROOT = "${fullWorkspaceDir}/dev"

data/lib/autoproj/jenkins/templates/buildconf-config.yml.erb

@@ -9,4 +9,5 @@ USE_OCL: false
 rtt_target: gnulinux
 rtt_corba_implementation: omniorb
 autoproj_test_utility_default: true
+import_log_enabled: false
 <%= ::YAML.dump('manifest_source' => vcs.to_hash).gsub(/^---\s*/, '') %>

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

@@ -1,43 +1,51 @@
+<%= render_template('library.pipeline') %>
+
 node(label: 'autoproj-jenkins') {
-    stage 'bootstrap'
-    <%= render_template('bootstrap.pipeline', vcs: vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
+    def fullWorkspaceDir = pwd()
+    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) %>
+    }
 
     dir('dev') {
         def arg_packages = "<%= package_names.map { |name| "'#{name}'" }.join(" ") %>"
 
-        stage 'checkout and update packages'
-        sh "${autoproj} test enable"
-        <%= render_template('setup-git-credentials.pipeline', credentials: vcs_credentials[:git], indent: 8) %>
-        sh "${autoproj} update ${arg_packages} --force-reset -k"
-
-        stage 'update package jobs and trigger them'
-        def arg_dev      = "<%= " --dev" if dev %>"
-        def arg_job_prefix = "<%= " '--job-prefix=#{job_prefix}'" if !job_prefix.empty? %>"
-        <% if vcs_credentials.empty?  %>
-        def arg_vcs_credentials = ""
-        <% else %>
-            <% arg_vcs_credentials = vcs_credentials.credentials.flat_map do |vcs_type, vcs_c|
-                  vcs_c.map do |c|
-                      "#{vcs_type}:#{c.protocol}://#{c.host}"
-                  end
-               end.join(" ") %>
-            def arg_vcs_credentials = " '--vcs-credentials=<%= arg_vcs_credentials %>'"
-        <% end %>
-
-        <% if credentials_id %>
-        def jobNames = withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '<%= credentials_id %>',
-                          usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            def credentials = " --username '${env.USERNAME}' --password '${env.PASSWORD}'"
-            sh(script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} '${env.JENKINS_URL}' ${arg_packages}${credentials}${arg_vcs_credentials}", returnStdout: true).split("\n")
+        stage('checkout and update packages') {
+            sh "${autoproj} test enable"
+            <%= render_template('setup-git-credentials.pipeline', credentials: vcs_credentials[:git], indent: 8) %>
+            sh "${autoproj} update ${arg_packages} --force-reset -k"
         }
-        <% else %>
-        def jobNames = sh(
-            script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} 'http://localhost:8080' ${arg_packages}${arg_vcs_credentials}",
-            returnStdout: true).split("\n")
-        <% end %>
-        for (job_name in jobNames) {
-            build job: job_name, wait: false
+
+        def jobNames = []
+
+        stage('update package jobs and trigger them') {
+            def arg_dev      = "<%= " --dev" if dev %>"
+            def arg_job_prefix = "<%= " '--job-prefix=#{job_prefix}'" if !job_prefix.empty? %>"
+            <% if vcs_credentials.empty?  %>
+            def arg_vcs_credentials = ""
+            <% else %>
+                <% arg_vcs_credentials = vcs_credentials.credentials.flat_map do |vcs_type, vcs_c|
+                      vcs_c.map do |c|
+                          "#{vcs_type}:#{c.protocol}://#{c.host}"
+                      end
+                   end.join(" ") %>
+                def arg_vcs_credentials = " '--vcs-credentials=<%= arg_vcs_credentials %>'"
+            <% end %>
+
+            <% if credentials_id %>
+            jobNames = withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '<%= credentials_id %>',
+                              usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+                def credentials = " --username '${env.USERNAME}' --password '${env.PASSWORD}'"
+                sh(script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} '${env.JENKINS_URL}' ${arg_packages}${credentials}${arg_vcs_credentials}", returnStdout: true).split("\n")
+            }
+            <% else %>
+            jobNames = sh(
+                script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} 'http://localhost:8080' ${arg_packages}${arg_vcs_credentials}",
+                returnStdout: true).split("\n")
+            <% end %>
         }
+        triggerDownstreamJobs(jobNames)
     }
 }
 

data/lib/autoproj/jenkins/templates/{wait-upstream.pipeline.erb → library.pipeline.erb}

@@ -1,3 +1,4 @@
+@NonCPS
 def isUpstreamOK(jobName, buildId)
 {
     def job = Jenkins.instance.getItem(jobName)
@@ -26,19 +27,23 @@ def isUpstreamOK(jobName, buildId)
     }
 }
 
+@NonCPS
 def getTriggerBuild(currentBuild)
 {
     def triggerBuild = currentBuild.rawBuild.getCause(hudson.model.Cause$UpstreamCause)
     if (triggerBuild) {
         return [triggerBuild.getUpstreamProject(), triggerBuild.getUpstreamBuild()]
     }
+    return null
 }
 
+@NonCPS
 def findBuildTriggeredBy(job, triggerJob, triggerBuild)
 {
     def jobBuilds = job.getBuilds()
-    for (build in jobBuilds)
+    for (buildIndex = 0; buildIndex < jobBuilds.size(); ++buildIndex)
     {
+        def build = jobBuilds[buildIndex]
         def buildCause = build.getCause(hudson.model.Cause$UpstreamCause)
         if (buildCause)
         {
@@ -50,6 +55,7 @@ def findBuildTriggeredBy(job, triggerJob, triggerBuild)
             }
         }
     }
+    return null
 }
 
 def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
@@ -57,8 +63,9 @@ def getUpstreamBuilds(upstreamJobNames, triggerJob, triggerBuild)
     def upstreamBuilds = []
 
     // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
-    for (jobName in upstreamJobNames)
+    for (jobIndex = 0; jobIndex < upstreamJobNames.size(); ++jobIndex)
     {
+        def jobName = upstreamJobNames[jobIndex]
         if (jobName == triggerJob)
         {
             echo "upstream build: ${jobName}#${triggerBuild}"
@@ -93,7 +100,9 @@ def waitForUpstreamBuilds(upstreamBuilds)
         waitContinue = false;
 
         // Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
-        for(entry in upstreamBuilds) {
+        for (upstreamBuildIndex = 0; upstreamBuildIndex < upstreamBuilds.size(); ++upstreamBuildIndex)
+        {
+            def entry = upstreamBuilds[upstreamBuildIndex]
             def upstreamJobName = entry[0]
             def upstreamBuildId = entry[1]
             def status = isUpstreamOK(upstreamJobName, upstreamBuildId)
@@ -122,7 +131,8 @@ def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,
     dir(upstreamDir) { deleteDir() }
 
     def upstreamArtifactImporters = [:]
-    for (jobIndex = 0; jobIndex < upstreamJobNames.size(); ++jobIndex) {
+    for (jobIndex = 0; jobIndex < upstreamJobNames.size(); ++jobIndex)
+    {
         def jobName        = upstreamJobNames[jobIndex]
         def fullPrefix     = upstreamPrefixes[jobIndex]
         def buildId        = upstreamBuilds[jobIndex][1]
@@ -147,14 +157,49 @@ def makeUpstreamArtifactImporters(autoproj, fullWorkspaceDir, upstreamDir,
     return upstreamArtifactImporters
 }
 
-def triggeredByUser = (currentBuild.rawBuild.getCause(hudson.model.Cause$UserIdCause) != null)
-def triggerBuild    = getTriggerBuild(currentBuild)
-if (!triggerBuild) {
-    triggerBuild = [null, null]
+def installUpstreamArtifacts(autoproj, fullWorkspaceDir,
+        jobPackageName, jobPackagePrefix,
+        upstreamJobNames, upstreamPackagePrefixes, upstreamBuilds)
+{
+    def upstreamDir = "artifacts/upstream"
+    parallel(makeUpstreamArtifactImporters(
+            autoproj, fullWorkspaceDir, upstreamDir,
+            upstreamJobNames, upstreamPackagePrefixes, upstreamBuilds)
+    )
+    // We don't need the upstream artifacts anymore, clear some disk space
+    dir(upstreamDir) { deleteDir() }
+
+    if (fileExists("lastPrefix")) {
+        sh "mv lastPrefix '${jobPackagePrefix}'"
+    }
+    return null
 }
-def upstreamBuilds = getUpstreamBuilds(upstreamJobNames, triggerBuild[0], triggerBuild[1])
 
-if (!waitForUpstreamBuilds(upstreamBuilds)) {
-    return
+def handleDownstream(autoproj, fullWorkspaceDir,
+        jobName, jobPackagePrefix, artifactGlob)
+{
+    def downstreamDir = "artifacts/downstream"
+    def targetArtifactPath = "${fullWorkspaceDir}/${downstreamDir}/${jobName}-prefix.zip"
+
+    dir(downstreamDir) { deleteDir() }
+    dir("${downstreamDir}/${jobName}") {
+        sh "rsync '${jobPackagePrefix}/' './' -a --delete"
+        sh "${autoproj} jenkins relativize ./ '${fullWorkspaceDir}' '@WORKSPACE_ROOT@'"
+        zip zipFile: targetArtifactPath, glob: artifactGlob
+    }
+    dir(downstreamDir) {
+        archiveArtifacts artifacts: "*.zip"
+        deleteDir()
+    }
+    return null
+}
+
+
+def triggerDownstreamJobs(jobNames) {
+    for (jobIndex = 0; jobIndex < jobNames.size(); ++jobIndex)
+    {
+        build job: jobNames[jobIndex], wait: false
+    }
+    return null
 }
 

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

@@ -1,96 +1,115 @@
 import java.nio.file.Paths
 
+def jobName = "<%= job_name %>"
 def jobPackageName = "<%= package_name %>"
 def upstreamJobNames = [<%= upstream_jobs.each_key.map { |job_name| "'#{job_name}'" }.join(", ") %>]
 def upstreamPackageNames = [<%= upstream_jobs.each_value.map { |package_name| "'#{package_name}'" }.join(", ") %>]
+<%= render_template('library.pipeline') %>
+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]
+    }
+    upstreamBuilds = getUpstreamBuilds(upstreamJobNames, triggerBuild[0], triggerBuild[1])
 
-stage 'waiting for upstream jobs to finish'
-<%= render_template('wait-upstream.pipeline') %>
+    if (!waitForUpstreamBuilds(upstreamBuilds)) {
+        return
+    }
+}
 
 node(label: 'autoproj-jenkins') {
+    def fullWorkspaceDir = pwd()
+    def autoproj = "${fullWorkspaceDir}/dev/.autoproj/bin/autoproj"
     dir('dev/install/log') { deleteDir() }
 
-    stage 'bootstrap'
-    <%= render_template('bootstrap.pipeline', vcs: buildconf_vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
-    stage 'install upstream artifacts'
+    def jobPackagePrefix = null
+    def upstreamPackagePrefixes = null
 
-    def upstreamDir = "artifacts/upstream"
-    def packagePrefixes = sh(script: "${autoproj} locate --no-cache --prefix '${jobPackageName}' ${upstreamPackageNames.join(" ")}", returnStdout: true).
-    split("\n")
+    stage('bootstrap') {
+        <%= render_template('bootstrap.pipeline', vcs: buildconf_vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
 
-    def jobPackagePrefix = packagePrefixes[0]
-    def upstreamPackagePrefixes = packagePrefixes.tail()
+        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',
+            text: jenkins_dependency_overrides
 
-    parallel(makeUpstreamArtifactImporters(
-            autoproj, fullWorkspaceDir, upstreamDir,
-            upstreamJobNames, upstreamPackagePrefixes, upstreamBuilds)
-    )
-    // We don't need the upstream artifacts anymore, clear some disk space
-    dir(upstreamDir) { deleteDir() }
+        def packagePrefixes = sh(script: "${autoproj} locate --no-cache --prefix '${jobPackageName}' ${upstreamPackageNames.join(" ")}", returnStdout: true).
+            split("\n")
 
-    if (fileExists("lastPrefix")) {
-        sh "mv lastPrefix '${jobPackagePrefix}'"
+        jobPackagePrefix        = packagePrefixes[0]
+        upstreamPackagePrefixes = packagePrefixes.tail()
     }
 
-    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',
-        text: jenkins_dependency_overrides
+    stage('install upstream artifacts') {
+        installUpstreamArtifacts(autoproj, fullWorkspaceDir,
+            jobPackageName, jobPackagePrefix,
+            upstreamJobNames, upstreamPackagePrefixes, upstreamBuilds)
+    }
 
     dir('dev') {
-        stage 'prepare build'
-        <%= render_template("import-#{vcs.type}.pipeline",
-                            patch: true,
-                            allow_unused: true,
-                            package_dir: package_dir,
-                            vcs: vcs,
-                            credentials: vcs_credentials.for(vcs),
-                            package_name: package_name,
-                            indent: 8) %>
-        sh "${autoproj} test disable '<%= package_name %>'"
-        sh "${autoproj} osdeps '<%= package_name %>' 'pkg-config'"
-
-        stage 'build'
-        try {
-            sh "${autoproj} build --force --deps=f '<%= package_name %>' -p1"
+        stage('prepare build') {
+            <%= render_template("import-#{vcs.type}.pipeline",
+                                patch: true,
+                                allow_unused: true,
+                                package_dir: package_dir,
+                                vcs: vcs,
+                                credentials: vcs_credentials.for(vcs),
+                                package_name: package_name,
+                                indent: 8) %>
+            sh "${autoproj} test disable '<%= package_name %>'"
+            sh "${autoproj} osdeps '<%= package_name %>' 'pkg-config'"
         }
-        catch(err) {
+
+        stage('build') {
+            try {
+                sh "${autoproj} build --force --deps=f '<%= package_name %>' -p1"
+            }
+            catch(err) {
+                archive includes: 'install/<%= package_name %>/log/<%= package_name %>-*.log'
+                throw(err)
+            }
             archive includes: 'install/<%= package_name %>/log/<%= package_name %>-*.log'
-            throw(err)
         }
-        archive includes: 'install/<%= package_name %>/log/<%= package_name %>-*.log'
     }
 
-    stage 'trigger dependencies'
-    <%= render_template('handle-downstream.pipeline',
-                        job_name: job_name,
-                        artifact_glob: artifact_glob,
-                        downstream_jobs: downstream_jobs,
-                        indent: 4) %>
-
-    stage 'tests'
-    def test_timestamp_path = "${fullWorkspaceDir}/test-timestamp"
-    touch file: test_timestamp_path
-    def test_output_path    = "${fullWorkspaceDir}/test"
-    def autoproj_test_failed = false
-    dir('dev')
-    {
-        try {
-            sh "${autoproj} test enable '<%= package_name %>'"
-            sh "${autoproj} osdeps '<%= package_name %>'"
-            sh "${autoproj} build --deps=f '<%= package_name %>' -p1"
-            sh "${autoproj} test -p=1 '<%= package_name %>'"
+    stage('handle downstream') {
+        handleDownstream(autoproj, fullWorkspaceDir,
+            jobName, jobPackagePrefix, "<%= artifact_glob %>")
+        if (! triggeredByUpstream) {
+            <% downstream_jobs.each_key do |job_name| %>
+            build job: "<%= job_name %>", wait: false
+            <% end %>
         }
-        catch(err) { autoproj_test_failed = true }
+    }
 
-        try { sh "${autoproj} jenkins postprocess-tests --after=${test_timestamp_path} ${test_output_path} '<%= package_name %>'" }
+    stage('tests') {
+        def test_timestamp_path = "${fullWorkspaceDir}/test-timestamp"
+        touch file: test_timestamp_path
+        def test_output_path    = "${fullWorkspaceDir}/test"
+        def autoproj_test_failed = false
+        dir('dev')
+        {
+            try {
+                sh "${autoproj} test enable '<%= package_name %>'"
+                sh "${autoproj} osdeps '<%= package_name %>'"
+                sh "${autoproj} build --deps=f '<%= package_name %>' -p1"
+                sh "${autoproj} test -p=1 '<%= package_name %>'"
+            }
+            catch(err) { autoproj_test_failed = true }
+
+            try { sh "${autoproj} jenkins postprocess-tests --after=${test_timestamp_path} ${test_output_path} '<%= package_name %>'" }
+            catch(err) { autoproj_test_failed = true }
+        }
+        try { junit allowEmptyResults: true, keepLongStdio: true, testResults: "test/*.xml" }
         catch(err) { autoproj_test_failed = true }
-    }
-    try { junit allowEmptyResults: true, keepLongStdio: true, testResults: "test/*.xml" }
-    catch(err) { autoproj_test_failed = true }
 
-    if (autoproj_test_failed)
-    {
-        currentBuild.result = 'UNSTABLE'
+        if (autoproj_test_failed)
+        {
+            currentBuild.result = 'UNSTABLE'
+        }
     }
 
     // Move the current package prefix to a separate folder, to ensure that

data/lib/autoproj/jenkins/updater.rb

@@ -50,7 +50,7 @@ module Autoproj::Jenkins
         #   with --dev or not
         # @param [Array<Autoproj::PackageDefinition>] packages if non-empty,
         #   restrict operations to these packages and their dependencies
-        def update_buildconf_pipeline(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, credentials_id: nil, vcs_credentials: Credentials.new)
+        def update_buildconf_pipeline(*packages, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, credentials_id: nil, vcs_credentials: Credentials.new)
             manifest_vcs = ws.manifest.vcs
             if manifest_vcs.local? || manifest_vcs.none?
                 raise ArgumentError, "cannot use Jenkins to build an autoproj buildconf that is not on a remotely acessible VCS"
@@ -59,7 +59,7 @@ module Autoproj::Jenkins
             job_name = job_name_from_package_name("buildconf")
             server.update_job_pipeline(job_name, 'buildconf.pipeline',
                 vcs: manifest_vcs,
-                package_names: package_names,
+                package_names: packages.map(&:name),
                 gemfile: gemfile,
                 autoproj_install_path: autoproj_install_path,
                 job_prefix: job_prefix,

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.2.2"
+        VERSION = "0.3.0"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
@@ -131,23 +131,21 @@ files:
 - lib/autoproj/jenkins/relativize.rb
 - lib/autoproj/jenkins/render_template.rb
 - lib/autoproj/jenkins/server.rb
-- lib/autoproj/jenkins/templates/abort-if-upstream-failed.pipeline.erb
 - lib/autoproj/jenkins/templates/bootstrap.pipeline.erb
 - lib/autoproj/jenkins/templates/buildconf-Gemfile
 - lib/autoproj/jenkins/templates/buildconf-config.yml.erb
 - lib/autoproj/jenkins/templates/buildconf-vagrant-Gemfile
 - lib/autoproj/jenkins/templates/buildconf.pipeline.erb
 - lib/autoproj/jenkins/templates/buildconf.xml.erb
-- lib/autoproj/jenkins/templates/handle-downstream.pipeline.erb
 - lib/autoproj/jenkins/templates/import-archive.pipeline.erb
 - lib/autoproj/jenkins/templates/import-git.pipeline.erb
 - lib/autoproj/jenkins/templates/import-svn.pipeline.erb
 - lib/autoproj/jenkins/templates/jenkins_dependency_overrides.rb.erb
+- lib/autoproj/jenkins/templates/library.pipeline.erb
 - lib/autoproj/jenkins/templates/package-Gemfile
 - lib/autoproj/jenkins/templates/package.pipeline.erb
 - lib/autoproj/jenkins/templates/package.xml.erb
 - lib/autoproj/jenkins/templates/setup-git-credentials.pipeline.erb
-- lib/autoproj/jenkins/templates/wait-upstream.pipeline.erb
 - lib/autoproj/jenkins/test_format_converters/boost-test.xsl
 - lib/autoproj/jenkins/updater.rb
 - lib/autoproj/jenkins/version.rb

data/lib/autoproj/jenkins/templates/abort-if-upstream-failed.pipeline.erb

@@ -1,18 +0,0 @@
-def upstream_jobs = [<%= upstream_jobs.each_key.map { |job_name| "'#{job_name}'" }.join(", ") %>]
-
-// Iterate list -- NOTE: we cannot use groovy style or even modern java style iteration
-for (int i = 0; i < upstream_jobs.size(); i++) {
-    def job = Jenkins.instance.getItem(upstream_jobs[i])
-    if (!job) {
-        error("cannot find upstream job ${upstream_jobs[i]}")
-    }
-
-    def result = job.getLastBuild().getResult()
-    if (result != Result.SUCCESS && result != Result.UNSTABLE)
-    {
-        echo "${upstream_jobs[i]} did not finish successfully, aborting this build"
-        currentBuild.result = 'NOT_BUILT';
-        return;
-    }
-}
-

data/lib/autoproj/jenkins/templates/handle-downstream.pipeline.erb

@@ -1,20 +0,0 @@
-def downstreamDir = "artifacts/downstream"
-def targetArtifactPath = "${fullWorkspaceDir}/${downstreamDir}/<%= job_name %>-prefix.zip"
-
-dir(downstreamDir) { deleteDir() }
-dir("${downstreamDir}/<%= job_name %>") {
-    sh "rsync '${jobPackagePrefix}/' './' -a --delete"
-    sh "${autoproj} jenkins relativize ./ '${fullWorkspaceDir}' '@WORKSPACE_ROOT@'"
-    zip zipFile: targetArtifactPath, glob: "<%= artifact_glob %>"
-}
-dir(downstreamDir) {
-    archiveArtifacts artifacts: "*.zip"
-    deleteDir()
-}
-
-if (triggeredByUser) { // Defined in handle-upstream.pipeline.erb
-    <% downstream_jobs.each_key do |job_name| %>
-    build job: "<%= job_name %>", wait: false
-    <% end %>
-}
-