autoproj-jenkins 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d96120cc78350275e92584c61af35c413bcafb
-  data.tar.gz: d1bd6d3060ea76972df27145c9fceed592354ba9
+  metadata.gz: e92a3c5e2fa195e68aa458ede6b7b9c3bd3f368b
+  data.tar.gz: 29128926f9dffaade30fbb54f81d932feddeba4b
 SHA512:
-  metadata.gz: 6d3f538eac2dd5471fb6bcf43f5f788e7babbe67ce8ced5edc8cc73a10eefeeece7e57dc9c55eacf37c2ebbac9b38ee27b2eec1e8112a78ef14fd28ad883e80d
-  data.tar.gz: 31525d9641c6df34e2b1b41af1700d3436381ca40bdacb3a4ec1b8b145598babbee284c4def436bb58d686ef721c3e89cf2f7d11da01be6e5682642846bd5e3e
+  metadata.gz: 62d363e754695d26b6f26e3ae43813c5513efd03679616347b966c98c1851524096d0c4b0776186daca6672ab0d60f45f67d20932445ff85a5aeff58f137a332
+  data.tar.gz: 786f2c9443ff314e25a7b61c8517998d8381c73801336c62f79ec7b1a5dab32973a29b8d79f3478f44887430f8fb94f3ff35699711151afdea1bb39c923f8d52

data/lib/autoproj/cli/jenkins.rb

@@ -22,7 +22,7 @@ module Autoproj
                 results
             end
 
-            def create_or_update_buildconf_job(*package_names, force: false, dev: false, credentials_id: nil, vcs_credentials: [])
+            def create_or_update_buildconf_job(*package_names, dev: false, credentials_id: nil, vcs_credentials: [])
                 initialize_and_load
 
                 if dev
@@ -42,7 +42,7 @@ module Autoproj
 
             def add_or_update_packages(*package_names, dev: false, vcs_credentials: [])
                 initialize_and_load
-                source_packages, _ = finalize_setup(package_names, non_imported_packages: nil)
+                source_packages, _ = finalize_setup(package_names, non_imported_packages: :ignore)
                 source_packages = source_packages.map do |package_name|
                     ws.manifest.package_definition_by_name(package_name)
                 end

data/lib/autoproj/cli/main_jenkins.rb

@@ -49,7 +49,6 @@ module Autoproj
             end
 
             desc 'init URL [PACKAGE NAMES]', 'initialize the jenkins server by creating the base build job, optionally restricting the build to certain packages'
-            option :force, desc: 'if set, delete any existing job'
             option :trigger, desc: 'trigger the job once created',
                 type: :boolean, default: false
             option :dev, desc: 'assume that the jenkins instance is a development instance under vagrant and that autoproj-jenkins is made available as /opt/autoproj-jenkins',
@@ -67,7 +66,6 @@ module Autoproj
                 ops.create_or_update_buildconf_job(
                     *package_names,
                     credentials_id: options[:credentials_id],
-                    force: options[:force],
                     vcs_credentials: options[:vcs_credentials],
                     dev: options[:dev])
                 if options[:trigger]
@@ -77,7 +75,6 @@ module Autoproj
 
 
             desc 'update [PACKAGE_NAMES]', 'add the following package and its dependencies to the jenkins build'
-            option :force, desc: 'ignore the current state, generate jobs as if nothing was ever done'
             option :dev, desc: 'assume that the jenkins instance is a development instance under vagrant and that autoproj-jenkins is made available as /opt/autoproj-jenkins',
                 type: :boolean, default: false
             option :vcs_credentials, desc: 'list of vcs_type:URLs for which credentials should be provided (see documentation)',

data/lib/autoproj/jenkins/server.rb

@@ -27,6 +27,28 @@ module Autoproj::Jenkins
             jobs.create(job_name, xml)
         end
 
+        # Reset the configuration of an existing job
+        # 
+        # @param [String] job_name the name of the new job
+        # @param [String] template the name of the template
+        # @param [Hash] parameters parameters for the template rendering
+        # @raise (see Autoproj::Jenkins.render_template)
+        def reset_job(job_name, template, **parameters)
+            xml = Autoproj::Jenkins.render_template(template, **parameters)
+            jobs.update(job_name, xml)
+        end
+
+        # Either create or reset a job, depending on whether it already exists
+        # or not
+        def create_or_reset_job(job_name, template, **parameters)
+            xml = Autoproj::Jenkins.render_template(template, **parameters)
+            if has_job?(job_name)
+                reset_job(job_name, template, **parameters)
+            else
+                create_job(job_name, template, **parameters)
+            end
+        end
+
         # Test whether the server already has a job
         #
         # @param [String] job_name

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

@@ -3,7 +3,6 @@
     <actions/>
     <description></description>
     <keepDependencies>false</keepDependencies>
-    <properties/>
     <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.9">
         <script>
         </script>
@@ -11,14 +10,24 @@
     </definition>
     <triggers/>
     <quietPeriod><%= quiet_period %></quietPeriod>
-    <jenkins.model.BuildDiscarderProperty>
-        <strategy class="hudson.tasks.LogRotator">
-            <daysToKeep>30</daysToKeep>
-            <numToKeep>-1</numToKeep>
-            <artifactDaysToKeep>7</artifactDaysToKeep>
-            <artifactNumToKeep>-1</artifactNumToKeep>
-        </strategy>
-    </jenkins.model.BuildDiscarderProperty>
+    <properties>
+        <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+            <triggers>
+                <hudson.triggers.SCMTrigger>
+                    <spec>H/30 * * * *</spec>
+                    <ignorePostCommitHooks>false</ignorePostCommitHooks>
+                </hudson.triggers.SCMTrigger>
+            </triggers>
+        </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+        <jenkins.model.BuildDiscarderProperty>
+            <strategy class="hudson.tasks.LogRotator">
+                <daysToKeep>30</daysToKeep>
+                <numToKeep>-1</numToKeep>
+                <artifactDaysToKeep>10</artifactDaysToKeep>
+                <artifactNumToKeep>-1</artifactNumToKeep>
+            </strategy>
+        </jenkins.model.BuildDiscarderProperty>
+    </properties>
 </flow-definition>
 
 

data/lib/autoproj/jenkins/updater.rb

@@ -36,16 +36,6 @@ module Autoproj::Jenkins
             @job_prefix = job_prefix
         end
 
-        # Create the master buildconf job
-        #
-        # @return [void]
-        def create_buildconf_job(force: false, quiet_period: 5)
-            if force
-                server.delete_job("#{job_prefix}buildconf")
-            end
-            server.create_job("#{job_prefix}buildconf", 'buildconf.xml', quiet_period: quiet_period)
-        end
-
         # Update the buildconf pipeline
         #
         # @param [String] jenkins_url the URL of the jenkins server from the
@@ -66,7 +56,8 @@ module Autoproj::Jenkins
                 raise ArgumentError, "cannot use Jenkins to build an autoproj buildconf that is not on a remotely acessible VCS"
             end
 
-            server.update_job_pipeline("#{job_prefix}buildconf", 'buildconf.pipeline',
+            job_name = job_name_from_package_name("buildconf")
+            server.update_job_pipeline(job_name, 'buildconf.pipeline',
                 vcs: manifest_vcs,
                 package_names: package_names,
                 gemfile: gemfile,
@@ -87,10 +78,9 @@ module Autoproj::Jenkins
         # @param [Integer] quiet_period the job's quiet period, in seconds.
         #   Mostly used within autoproj-jenkins tests
         def create_or_update_buildconf_job(*packages, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, quiet_period: 5, credentials_id: nil, vcs_credentials: Credentials.new)
-            job_name = "#{job_prefix}buildconf"
-            if !server.has_job?(job_name)
-                create_buildconf_job(quiet_period: quiet_period)
-            end
+            job_name = job_name_from_package_name("buildconf")
+            server.create_or_reset_job(job_name, 'buildconf.xml', quiet_period: quiet_period)
+
             update_buildconf_pipeline(
                 *packages,
                 gemfile: gemfile,
@@ -108,18 +98,6 @@ module Autoproj::Jenkins
             "#{job_prefix}#{package_name.gsub('/', '-')}"
         end
 
-        # Create a job for a package
-        #
-        # @return [void]
-        def create_package_job(package, job_name: job_name_from_package_name(package.name), force: false, quiet_period: 5)
-            job_name = job_name_from_package_name(package.name)
-            if force
-                server.delete_job(job_name)
-            end
-
-            server.create_job(job_name, 'package.xml', quiet_period: quiet_period)
-        end
-
         # Resolve a package by its name
         def package_by_name(package_name)
             package = ws.manifest.find_package_definition(package_name)
@@ -171,9 +149,9 @@ module Autoproj::Jenkins
 
             packages.each do |package|
                 job_name = job_name_from_package_name(package.name)
-                if !server.has_job?(job_name)
-                    create_package_job(package, job_name: job_name, quiet_period: quiet_period)
-                end
+                server.create_or_reset_job(
+                    job_name, 'package.xml',
+                    job_name: job_name, quiet_period: quiet_period)
             end
 
             package_names = packages.map(&:name).to_set

data/lib/autoproj/jenkins/version.rb

@@ -1,5 +1,5 @@
 module Autoproj
     module Jenkins
-        VERSION = "0.1.0"
+        VERSION = "0.2.0"
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
@@ -176,4 +176,3 @@ signing_key:
 specification_version: 4
 summary: Exporting an autoproj build to a jenkins server
 test_files: []
-has_rdoc: