RubyGems - jujube - Versions diffs - 0.14.0 → 0.15.0 - Mend

jujube 0.14.0 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/.travis.yml +4 -1
data/CHANGELOG.md +10 -1
data/acceptance/fixtures/endToEnd/endToEnd.job +23 -0
data/acceptance/fixtures/endToEnd/expected.yml +60 -32
data/lib/jujube/components/publishers.rb +9 -0
data/lib/jujube/components/triggers.rb +9 -0
data/lib/jujube/version.rb +1 -1
data/test/components/publishers_test.rb +5 -0
data/test/components/triggers_test.rb +16 -0
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 686a1fe816b64601c238d50bc6e553335d4e490f2ee2efe0ebd58ca8ce07f5f5
-  data.tar.gz: c3160bbd7c4324ea74386173f7edc643db411a3273e97e0b97b6ba16fb3befa7
+  metadata.gz: a148bb517bd4ae2bd3a7f5b7c30a22b8b9d90208a4110cb147242f3774fb0f6b
+  data.tar.gz: 73d85983940938cdb5fa875019f2c03bf458afea2a63d49b676929577aa10f8b
 SHA512:
-  metadata.gz: 79c9dc2af5a9a58c6526724f6e7ab19041d56f4528be4164a16b2c3a65e6cdd87097fae9581d82aa00acd62dfcc4ba4edb0016b2a8424b28f09b10852ccd94b5
-  data.tar.gz: 1459dd0c1cc8223a42e1effd988adbf94c9840d191e3bafcf33d397290ec255e92f7fd084e60254de95570074d845a4fee01f3a15b0b15dba38e7ede1ef8fbec
+  metadata.gz: d4327e583553f38d9c23380512dd3706cbf6902a3a71820cced4d8601957872ad435a7cea49ad4f37da06bf3e2da0f5e029322002ad8ed120ed4238e50e9c0a8
+  data.tar.gz: 730a71f92867705079e3ffcd31b8afaa61ae6c2bd63fb39b86336d70968df6876d8d201f6b2bcf8189328ea2154da406b077e7d0bfd30b38c73ebf0da6fd884e

data/.travis.yml CHANGED Viewed

@@ -10,4 +10,7 @@ matrix:
     - rvm: jruby-9
     - rvm: jruby-head
   fast_finish: true
-script: "bundle exec rake"
+before_install:
+  - gem install bundler:1.17.3
+  - bundle _1.17.3_ install --jobs=3 --retry=3
+script: "bundle _1.17.3_ exec rake"

data/CHANGELOG.md CHANGED Viewed

@@ -5,6 +5,14 @@ adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
+## [0.15.0][0.15.0]
+### Added
+- Support the `gitlab` trigger (see https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gitlab) ([#18](https://github.com/randycoulman/jujube/pull/18)) (with @halverneus)
+- Support the `gitlab-notifier` publisher (see https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.gitlab-notifier) ([#19](https://github.com/randycoulman/jujube/pull/19)) (with @halverneus)
 ## [0.14.0][0.14.0]
 ### Added
@@ -92,7 +100,8 @@ adheres to [Semantic Versioning](http://semver.org/).
 - Initial public release.
-[unreleased]: https://github.com/randycoulman/jujube/compare/v0.14.0...HEAD
+[unreleased]: https://github.com/randycoulman/jujube/compare/v0.15.0...HEAD
+[0.15.0]: https://github.com/randycoulman/jujube/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/randycoulman/jujube/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/randycoulman/jujube/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/randycoulman/jujube/compare/v0.11.0...v0.12.0

data/acceptance/fixtures/endToEnd/endToEnd.job CHANGED Viewed

@@ -31,6 +31,28 @@ job "endToEnd" do |j|
     pundles << package("PACKAGE") << bundle("BUNDLE")
   end
+  j.triggers << gitlab(
+    trigger_push: true,
+    trigger_merge_request: false,
+    trigger_accepted_merge_request: true,
+    trigger_closed_merge_request: false,
+    trigger_open_merge_request_push: "source",
+    trigger_note: true,
+    note_regex: "plz build",
+    ci_skip: false,
+    wip_skip: true,
+    set_build_description: false,
+    add_note_merge_request: true,
+    add_vote_merge_request: false,
+    accept_merge_request_on_success: true,
+    add_ci_message: false,
+    allow_all_branches: true,
+    branch_filter_type: "All",
+    include_branches: %w{branch1 branch2},
+    exclude_branches: %w{branch3 branch4},
+    target_branch_regex: "branch.*",
+    secret_token: "s3kr3t"
+  )
   j.triggers << pollscm(cron: "INTERVAL", ignore_post_commit_hooks: true)
   j.triggers << pollurl(cron: "CRON", polling_node: "NODE") do |urls|
     urls << url("URL",
@@ -59,6 +81,7 @@ job "endToEnd" do |j|
   j.publishers << cppcheck(pattern: "PATTERN")
   j.publishers << email_ext(recipients: %w{fred barney})
   j.publishers << fitnesse(results: "FITNESSE_RESULTS")
+  j.publishers << gitlab_notifier(name: "GITLAB", mark_unstable_as_success: true)
   j.publishers << ircbot(notify_start: true)
   j.publishers << junit(results: "RESULTS", keep_long_stdio: false)
   j.publishers << trigger(project: "PROJECT")

data/acceptance/fixtures/endToEnd/expected.yml CHANGED Viewed

@@ -54,6 +54,31 @@
             - package: PACKAGE
             - bundle: BUNDLE
     triggers:
+      - gitlab:
+          trigger-push: true
+          trigger-merge-request: false
+          trigger-accepted-merge-request: true
+          trigger-closed-merge-request: false
+          trigger-open-merge-request-push: source
+          trigger-note: true
+          note-regex: plz build
+          ci-skip: false
+          wip-skip: true
+          set-build-description: false
+          add-note-merge-request: true
+          add-vote-merge-request: false
+          accept-merge-request-on-success: true
+          add-ci-message: false
+          allow-all-branches: true
+          branch-filter-type: All
+          include-branches:
+            - branch1
+            - branch2
+          exclude-branches:
+            - branch3
+            - branch4
+          target-branch-regex: "branch.*"
+          secret-token: s3kr3t
       - pollscm:
           cron: INTERVAL
           ignore-post-commit-hooks: true
@@ -72,14 +97,14 @@
               check-content:
                 - simple: true
                 - json:
-                  - JSON_PATH1
-                  - JSON_PATH2
+                    - JSON_PATH1
+                    - JSON_PATH2
                 - xml:
-                  - XPATH1
-                  - XPATH2
+                    - XPATH1
+                    - XPATH2
                 - text:
-                  - REGEX1
-                  - REGEX2
+                    - REGEX1
+                    - REGEX2
       - reverse:
           jobs: "PROJECT1, PROJECT2"
           result: unstable
@@ -110,6 +135,9 @@
             - barney
       - fitnesse:
           results: FITNESSE_RESULTS
+      - gitlab-notifier:
+          name: GITLAB
+          mark-unstable-as-success: true
       - ircbot:
           notify-start: true
       - junit:
@@ -118,34 +146,34 @@
       - trigger:
           project: PROJECT
       - trigger-parameterized-builds:
-        - project:
-            - PROJECT1
-            - PROJECT2
-          predefined-parameters: |
-            param1=VALUE1
-            param2=VALUE2
-          current-parameters: true
-          node-parameters: false
-          svn-revision: true
-          include-upstream: false
-          git-revision:
-            combine-queued-commits: true
-          boolean-parameters:
+          - project:
+              - PROJECT1
+              - PROJECT2
+            predefined-parameters: |
+              param1=VALUE1
+              param2=VALUE2
+            current-parameters: true
+            node-parameters: false
+            svn-revision: true
+            include-upstream: false
+            git-revision:
+              combine-queued-commits: true
+            boolean-parameters:
               bool1: true
               bool2: false
-          condition: FAILED_OR_BETTER
-          property-file: FILE.properties
-          fail-on-missing: true
-          use-matrix-child-files: false
-          only-exact-matrix-child-runs: true
-          file-encoding: UTF-8
-          trigger-with-no-params: false
-          restrict-matrix-project: label=="x86"
-          node-label-name: LABEL_NAME
-          node-label: LABEL
-        - project: SINGLE_PROJECT
-          predefined-parameters: param=VALUE
-          git-revision: true
+            condition: FAILED_OR_BETTER
+            property-file: FILE.properties
+            fail-on-missing: true
+            use-matrix-child-files: false
+            only-exact-matrix-child-runs: true
+            file-encoding: UTF-8
+            trigger-with-no-params: false
+            restrict-matrix-project: label=="x86"
+            node-label-name: LABEL_NAME
+            node-label: LABEL
+          - project: SINGLE_PROJECT
+            predefined-parameters: param=VALUE
+            git-revision: true
       - xunit:
           types:
             - unittest:

data/lib/jujube/components/publishers.rb CHANGED Viewed

@@ -41,6 +41,15 @@ module Jujube
       # @return [Hash] The specification for the component.
       standard_component :fitnesse
+      # @!method gitlab_notifier(options = {})
+      # Specify a `gitlab-notifier` publisher for a job.
+      #
+      # See {https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.gitlab-notifier}.
+      #
+      # @param options [Hash] The configuration options for the component.
+      # @return [Hash] The specification for the component.
+      standard_component :gitlab_notifier
       # @!method ircbot(options = {})
       # Specify an `ircbot` publisher for a job.
       #

data/lib/jujube/components/triggers.rb CHANGED Viewed

@@ -5,6 +5,15 @@ module Jujube
     module Triggers
       extend Macros
+      # @!method gitlab(options = {})
+      # Specify a `gitlab` trigger for a job.
+      #
+      # See {https://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.gitlab}.
+      #
+      # @param options [Hash] The configuration options for the component.
+      # @return [Hash] The specification for the component.
+      standard_component :gitlab
       # @!method pollscm(options = {})
       # Specify a `pollscm` trigger for a job.
       #

data/lib/jujube/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # Top-level namespace for the gem.
 module Jujube
   # The current gem version.
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/test/components/publishers_test.rb CHANGED Viewed

@@ -27,6 +27,11 @@ class PublishersTest < Minitest::Test
     assert_equal(expected, fitnesse(results: "RESULTS"))
   end
+  def test_gitlab_notifier
+    expected = {"gitlab-notifier" => {"name" => "NAME"}}
+    assert_equal(expected, gitlab_notifier(name: "NAME"))
+  end
   def test_ircbot
     expected = {"ircbot" => {"notify-start" => true}}
     assert_equal(expected, ircbot(notify_start: true))

data/test/components/triggers_test.rb CHANGED Viewed

@@ -3,6 +3,22 @@ require_relative "../test_helper"
 class TriggersTest < Minitest::Test
   include Jujube::Components
+  def test_gitlab
+    expected = {
+      "gitlab" => {
+        "trigger-note" => false,
+        "target-branch-regex" => "branches.*",
+        "include-branches" => ["b1", "b2"]
+      }
+    }
+    actual = gitlab(
+      trigger_note: false,
+      target_branch_regex: "branches.*",
+      include_branches: %w{b1 b2}
+    )
+    assert_equal(expected, actual)
+  end
   def test_pollscm
     expected = {
       "pollscm" => {

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jujube
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Randy Coulman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler