Merge pull request #13 from mroelandts/concurrent_feature

Add concurrent to job definition

Author: randycoulman

CHANGELOG.md

@@ -5,6 +5,11 @@ adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+### Added
+
+* Support the `concurrent` job attribute
+(see https://docs.openstack.org/infra/jenkins-job-builder/definition.html?highlight=concurrent).
+
 ## [0.13.0][0.13.0]
 
 ### Added

README.md

@@ -6,7 +6,7 @@
 ![Maintenance Status](https://img.shields.io/badge/maintenance-active-green.svg)
 
 **Jujube** is a Ruby front-end for
-[jenkins-job-builder](https://github.com/openstack-infra/jenkins-job-builder).
+[jenkins-job-builder](https://opendev.org/jjb/jenkins-job-builder).
 
 jenkins-job-builder allows you to specify Jenkins jobs in YAML and then creates or
 updates the jobs in a running Jenkins instance.  It provides some tools for removing
@@ -101,6 +101,7 @@ The following job attributes are supported:
 * `block_upstream`
 * `block_downstream`
 * `quiet_period`
+* `concurrent`
 * `disabled`
 
 The following sections and components are supported:
@@ -116,7 +117,7 @@ The following sections and components are supported:
   `trigger`, `trigger_parameterized_builds`, `unittest`, `xunit`)
 * `notifications`: None defined yet
 
-See [the end-to-end example job](examples/fixtures/endToEnd/endToEnd.job) for example
+See [the end-to-end example job](acceptance/fixtures/endToEnd/endToEnd.job) for example
 uses of all of the supported attributes, sections, and components.
 
 In general, component options are typically specified as standard Ruby hashes.  The option

acceptance/fixtures/endToEnd/endToEnd.job

@@ -4,6 +4,7 @@ job "endToEnd" do |j|
   j.block_upstream = true
   j.block_downstream = false
   j.quiet_period = 42
+  j.concurrent = true
   j.disabled = true
 
   j.axes << slave(:arch, %w{i386 amd64})

acceptance/fixtures/endToEnd/expected.yml

@@ -6,6 +6,7 @@
     block-upstream: true
     block-downstream: false
     quiet-period: 42
+    concurrent: true
     disabled: true
     project-type: matrix
     axes:

lib/jujube/job.rb

@@ -27,7 +27,7 @@ def initialize(job_name)
     # @!attribute name
     #   The name of the job - will be the name as seen in Jenkins.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [String]
     attribute :name
@@ -36,55 +36,63 @@ def initialize(job_name)
     #   The type of job. This normally does not need to be specified, as it
     #   will be inferred as `matrix` if any `axes` are added.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [String]
     attribute :project_type
 
     # @!attribute description
     #   The description of the job.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [String]
     attribute :description
 
     # @!attribute node
     #   The Jenkins node or named group where the job should be run.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [String]
     attribute :node
 
     # @!attribute block_upstream
     #   `true` if this job should block while upstream jobs are running.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [Boolean]
     attribute :block_upstream
 
     # @!attribute block_downstream
     #   `true` if this job should block while downstream jobs are running.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [Boolean]
     attribute :block_downstream
 
     # @!attribute quiet_period
     #   Number of seconds to wait between consecutive runs of the job.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [Fixnum]
     attribute :quiet_period
 
+    # @!attribute concurrent
+    #   `true` if this job should be concurrent.
+    #
+    #   See {https://docs.openstack.org/infra/jenkins-job-builder/definition.html?highlight=concurrent}.
+    #
+    #   @return [Boolean]
+    attribute :concurrent
+
     # @!attribute disabled
     #   `true` if this job should be disabled.
     #
-    #   See {http://docs.openstack.org/infra/jenkins-job-builder/general.html}.
+    #   See {http://docs.openstack.org/infra/jenkins-job-builder/definition.html}.
     #
     #   @return [Boolean]
     attribute :disabled

test/job_test.rb

@@ -40,6 +40,11 @@ def test_includes_quiet_period
     assert_yaml_matches("quiet-period: 42")
   end
 
+  def test_includes_concurrent
+    @job.concurrent = true
+    assert_yaml_matches("concurrent: true")
+  end
+
   def test_includes_disabled
     @job.disabled = true
     assert_yaml_matches("disabled: true")