autoproj-jenkins 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13ae4987a42da1d0a0c189cfd334388ee517144
-  data.tar.gz: 8a9c5782ebb1d54b488d01dcb4aefbe0c1312071
+  metadata.gz: 72a9cb86a1c8f624ec17a0a6ce883707efc5404a
+  data.tar.gz: d86de73479511e2832c12ac3d72a25ee199b9246
 SHA512:
-  metadata.gz: aabb3ee8fe4f6854088c23ce1b2c189acd4baf222a8a8437a76396efe7b104a5a9c09e242fdcec61444dbe11efa19ac2b48ca7b0a83f41981044a1ed8c4baff3
-  data.tar.gz: 86f7d440a45487a65e1fd51fb00271877afeb4e4fa7fdfe27ce80741d9f9c80af9360e044c6c30a731bbf4cd3cbdb4830b4e50ea6530c87cc51f918f71158509
+  metadata.gz: a6dceca3786f5b619cd8b44261d6af87f7487775b4f174f45e606edd0f040d015c917929035f21c6e39b33c5f4f8d358c5b9dff0bdfdc331e5dbfdd42a42c1bc
+  data.tar.gz: b6feea0a79c995366cc9efd0fba0f0e34cd9daeeced9e274dcd6a8346eb15e73e6aaa47ae98dad1f700a028bbcc9da586f7e6ab1ae560e2270ebfabecca8dbe3

data/lib/autoproj/cli/jenkins.rb

@@ -22,7 +22,7 @@ module Autoproj
                 results
             end
 
-            def create_or_update_buildconf_job(*package_names, dev: false, credentials_id: nil, vcs_credentials: [])
+            def create_or_update_buildconf_job(*package_names, seed: nil, dev: false, credentials_id: nil, vcs_credentials: [])
                 initialize_and_load
 
                 if dev
@@ -38,12 +38,13 @@ module Autoproj
                 # the buildconf template, so that the metapackage gets resolved
                 # each time instead of only at the point 'jenkins init' was done
                 updater.create_or_update_buildconf_job(*package_names, gemfile: gemfile,
+                                                       seed: seed,
                                                        autoproj_install_path: autoproj_install_path, dev: dev,
                                                        credentials_id: credentials_id,
                                                        vcs_credentials: parse_vcs_credentials(vcs_credentials))
             end
 
-            def add_or_update_packages(*package_names, dev: false, vcs_credentials: [])
+            def add_or_update_packages(*package_names, seed: nil, dev: false, vcs_credentials: [])
                 initialize_and_load
                 source_packages, _ = finalize_setup(package_names, non_imported_packages: :ignore)
                 source_packages = source_packages.map do |package_name|
@@ -60,6 +61,7 @@ module Autoproj
 
                 updater.update(
                     *source_packages,
+                    seed: seed,
                     gemfile: gemfile,
                     autoproj_install_path: autoproj_install_path,
                     vcs_credentials: parse_vcs_credentials(vcs_credentials))

data/lib/autoproj/cli/main_jenkins.rb

@@ -59,12 +59,19 @@ module Autoproj
                 default: 'autoproj-jenkins-cli'
             option :vcs_credentials, desc: 'list of vcs_type:URLs for which credentials should be provided (see documentation)',
                 type: :array, default: []
+            option :seed, desc: 'a YAML file containing seed configuration',
+                type: :string
             def init(url, *package_names)
                 require 'autoproj/cli/jenkins'
                 ops = create_ops(url, target_os: options[:target_os])
 
+                if options[:seed]
+                    seed = File.read(options[:seed])
+                end
+
                 ops.create_or_update_buildconf_job(
                     *package_names,
+                    seed: seed,
                     credentials_id: options[:credentials_id],
                     vcs_credentials: options[:vcs_credentials],
                     dev: options[:dev])
@@ -79,11 +86,18 @@ module Autoproj
                 type: :boolean, default: false
             option :vcs_credentials, desc: 'list of vcs_type:URLs for which credentials should be provided (see documentation)',
                 type: :array, default: []
+            option :seed, desc: 'a YAML file containing seed configuration',
+                type: :string
             def update(url, *package_names)
                 require 'autoproj/cli/jenkins'
+
+                if options[:seed]
+                    seed = File.read(options[:seed])
+                end
+
                 ops = create_ops(url)
                 Autoproj.report(silent: !options[:debug], debug: options[:debug]) do
-                    updated_jobs = ops.add_or_update_packages(*package_names, dev: options[:dev], vcs_credentials: options[:vcs_credentials])
+                    updated_jobs = ops.add_or_update_packages(*package_names, seed: seed, dev: options[:dev], vcs_credentials: options[:vcs_credentials])
                     updated_jobs.sort.each do |job_name|
                         puts job_name
                     end

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

@@ -6,7 +6,9 @@ sh 'wget -O autoproj_install https://raw.githubusercontent.com/rock-core/autopro
 <% end %>
 def gemfile = "<%= read_and_escape_file gemfile %>"
 writeFile file: 'Gemfile', text: gemfile
-def config = "<%= render_template('buildconf-config.yml', vcs: vcs, escape: true) %>"
+def user_seed_config = "<%= escape_to_groovy(seed) %>"
+writeFile file: 'user_seed.yml', text: user_seed_config
+def config = "<%= render_template('buildconf-config.yml', seed: seed, vcs: vcs, escape: true) %>"
 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"

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

@@ -1,14 +1,7 @@
 osdeps_mode: 'all'
-GITORIOUS: http,http,http
-GITHUB: http,http,http
 separate_prefixes: true
-ROCK_SELECTED_FLAVOR: master
-ROCK_FLAVOR: master
-ROCK_BRANCH: master
-USE_OCL: false
-rtt_target: gnulinux
-rtt_corba_implementation: omniorb
 autoproj_test_utility_default: true
 import_log_enabled: false
 jenkins_ci: true
 <%= ::YAML.dump('manifest_source' => vcs.to_hash).gsub(/^---\s*/, '') %>
+<%= seed %>

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', poll: true, vcs: vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
+        <%= render_template('bootstrap.pipeline', seed: seed, poll: true, vcs: vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
     }
 
     dir('dev') {
@@ -37,15 +37,15 @@ node(label: 'autoproj-jenkins') {
             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")
+                sh(script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} --seed=../user_seed.yml '${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}",
+                script: "${autoproj} jenkins update${arg_dev}${arg_job_prefix} --seed=../user_seed.yml 'http://localhost:8080' ${arg_packages}${arg_vcs_credentials}",
                 returnStdout: true).split("\n")
             <% end %>
+            triggerDownstreamJobs(jobNames)
         }
-        triggerDownstreamJobs(jobNames)
     }
 }
 

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

@@ -8,6 +8,10 @@ def isUpstreamOK(jobName, buildId)
     }
 
     def build = job.getBuild(buildId.toString())
+    if (!build)
+    {
+        error("cannot find build ${buildId} of job ${jobName}")
+    }
 
     def result = build.getResult()
     if (result)

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

@@ -44,7 +44,7 @@ node(label: 'autoproj-jenkins') {
     def upstreamPackagePrefixes = null
 
     stage('bootstrap') {
-        <%= render_template('bootstrap.pipeline', poll: false, vcs: buildconf_vcs, gemfile: gemfile, autoproj_install_path: autoproj_install_path, vcs_credentials: vcs_credentials, indent: 4) %>
+        <%= render_template('bootstrap.pipeline', seed: seed, 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',

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 render_buildconf_pipeline(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, credentials_id: nil, vcs_credentials: Credentials.new)
+        def render_buildconf_pipeline(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, credentials_id: nil, vcs_credentials: Credentials.new, seed: nil)
             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"
@@ -64,6 +64,7 @@ module Autoproj::Jenkins
                 autoproj_install_path: autoproj_install_path,
                 job_prefix: job_prefix,
                 credentials_id: credentials_id,
+                seed: seed,
                 vcs_credentials: vcs_credentials,
                 dev: dev)
         end
@@ -77,7 +78,7 @@ module Autoproj::Jenkins
         #   within VMs
         # @param [Integer] quiet_period the job's quiet period, in seconds.
         #   Mostly used within autoproj-jenkins tests
-        def create_or_update_buildconf_job(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, quiet_period: 5, credentials_id: nil, vcs_credentials: Credentials.new)
+        def create_or_update_buildconf_job(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, seed: nil, dev: false, quiet_period: 5, credentials_id: nil, vcs_credentials: Credentials.new)
             job_name = job_name_from_package_name("buildconf")
 
             pipeline = render_buildconf_pipeline(
@@ -86,6 +87,7 @@ module Autoproj::Jenkins
                 autoproj_install_path: autoproj_install_path,
                 credentials_id: credentials_id,
                 vcs_credentials: vcs_credentials,
+                seed: seed,
                 dev: dev)
             server.create_or_reset_job(job_name, 'buildconf.xml', pipeline: pipeline, quiet_period: quiet_period)
         end
@@ -144,7 +146,7 @@ module Autoproj::Jenkins
         #
         # @return [Array<String>] the list of names of the jobs that have been
         #   created/updated
-        def update(*packages, quiet_period: 5, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, vcs_credentials: Credentials.new)
+        def update(*packages, seed: nil, quiet_period: 5, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, vcs_credentials: Credentials.new)
             reverse_dependencies = ws.manifest.compute_revdeps
 
             package_names = packages.map(&:name).to_set
@@ -168,6 +170,7 @@ module Autoproj::Jenkins
                 pipeline = server.render_pipeline(job_name, 'package.pipeline',
                     buildconf_vcs: ws.manifest.vcs,
                     vcs: package.vcs,
+                    seed: seed,
                     package_name: package.name,
                     package_dir: Pathname.new(package.autobuild.srcdir).relative_path_from(Pathname.new(ws.root_dir)).to_s,
                     artifact_glob: "**/*",

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.3.12"
+        VERSION = "0.3.13"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client