jenkins_pipeline_builder 0.10.0 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODkxMTI3ZjEzZDRmMWZhZWNhZDIzZmQ5M2ZmOWU5ODlkODdmNTM2Mw==
+    OWM0OWI1ZDRjYjQxYWZmYThlYmIxZmY3ODhkNjA1ZDI3MTRhYzYyZA==
   data.tar.gz: !binary |-
-    NzhhODIxNTBjNzVmOGEyN2QwZjhmZDI0OWZhMmY2ZjEwZThlOGYyNg==
+    YzUyNWQyM2NlOWJlMTEzZjQzMzM0ZTAwYzkzNzFlNWI2MDA5ZGEzMg==
 SHA512:
   metadata.gz: !binary |-
-    MjQzYTZkNTE1ZWE2MDVhMmM4MTE3NTE5MGJiM2RjOWFmY2FiZjE2NmZlZjMw
-    MzM1YmU1M2ZjYTNjNDczMDBmYzU4MWU2NjJjODk1MTMxNDJjOTc3YWQ2MmU0
-    YWQ0OTk4OTA2ZjBkNjAzZTYwYjIwYzY1YjYzNDVjNGMxYTdkNjY=
+    ZWU4ODMxYjA0YTMwNWVkODkyNjk2NDA1MjIwNTMxNjg3Yzg2NDY2NTU3M2Q4
+    ODU2MmQ1ZjJkMmRkMTNjOWQyYWY5YzI1MjY5Y2NhMzg5OWQ4NzEzMTUzZTBh
+    ODcwOGQ3N2E2MzFjNTIxYzQyZThjYmM3YzI3OGU0ZDdhZmJlYjc=
   data.tar.gz: !binary |-
-    Y2E2NWVhYTY2ZjlmZWY4ZmRlNDU2MzNhODZjNjczYTk4NWE5YTRiMmZiMjNk
-    NTE0OTBmMzJmMDE0NzBhMTYxOTczN2U1MjBiNzEwM2FlMTE1ZThhZmUzNDg3
-    NGU4NGYyNWU2NTM3YWVkOTdjMjIxMzg4ZjdjYTRjNDNkOGNhODk=
+    MjA1MTMwMTE3MjU1ZTZjNzlmZDMwZmY0Mzc1NzY0OTdjYWVlY2VkZGE3ODgz
+    NzcwMTY0ZGFmNDVlNWY5NGEwNjY2ZjZjZmMxMTk0Y2YyMWU3OGY5NTk2NTZi
+    OTdlYjIyMDdjNDA4NWMyYTgzMzhlZmFlOWRmYjAwNWY0ZjYwODg=

data/README.md

@@ -289,6 +289,72 @@ Here's a high level overview of what's available:
 NOTE: The *promoted_builds* plugin is not fully implemented. This plugin just helps you point to the jobs that you have in order to promote your build.
 You need to manually create your promotion rules. Using this plugin will help you regenerate your jobs without breaking your manual promotion jobs.
 
+### Enable Blocks
+Blocks can be enabled and disabled like so:
+
+Project.yaml
+```yaml
+- defaults:
+    name: global
+    description: DB Pipeline tooling
+    git_repo: git@github.roving.com:devops/DBPipeline.git
+    git_branch: master
+    excluded_user: buildmaster
+    hipchat_room: CD Builds
+    hipchat_auth_token: f3e98ed54605b36f56dd2c562e3775
+    discard_days: '30'
+    discard_number: '100'
+    maven_name: 'tools-maven-3.0.3'
+    hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/'
+
+- project:
+    name: 'PushTest'
+    hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/'
+    jobs:
+        - '{{name}}-build':
+            use: true
+```
+
+build.yaml
+```yaml
+- job:
+    name: '{{name}}-build'
+    project_name: '{{name}}'
+    builders:
+        - maven3:
+              enabled: '{{use}}'
+              parameters:
+                  rootPom: one
+```
+
+If use is true, the params are applied to the maven3 block as seen
+below:
+
+build.yaml
+```yaml
+- job:
+    name: '{{name}}-build'
+    project_name: '{{name}}'
+    builders:
+        - maven3:
+            rootPom: one
+```
+
+The above two build.yaml files are equivalent (for use: true)
+
+The block needs to have both an enabled and parameters key, and no other
+keys for the enables to work.  Also note that this will fail:
+
+```yaml
+enabled: {{use}}
+```
+
+While this will work:
+
+```yaml
+enabled: '{{use}}'
+```
+
 ### Pull Request Generator
 
 The pull request generator will generate pipelines for pull requests that are noticed on your repo. It will also remove old pipelines from Jenkins if the pull_request is closed.

data/lib/jenkins_pipeline_builder/compiler.rb

@@ -38,7 +38,7 @@ module JenkinsPipelineBuilder
       vars = value_s.scan(/{{([^{}@]+)}}/).flatten
       vars.select! do |var|
         var_val = settings[var]
-        value_s.gsub!("{{#{var}}}", var_val) unless var_val.nil?
+        value_s.gsub!("{{#{var}}}", var_val.to_s) unless var_val.nil?
         var_val.nil?
       end
       return nil if vars.count != 0
@@ -103,21 +103,25 @@ module JenkinsPipelineBuilder
       [true, result]
     end
 
-    def self.handle_enable(item)
+    def self.handle_enable(item, settings, job_collection)
       if item.key?(:enabled) && item.key?(:parameters) && item.length == 2
-        return {} unless item[:enabled]
+        enabled_switch = resolve_value(item[:enabled], settings, job_collection)
+        return [true, {}] if enabled_switch == 'false'
+        return [false, { 'value error' => "Invalid value for #{item[:enabled]}: #{enabled_switch}" }] \
+          if enabled_switch != 'true'
         item = item.merge item[:parameters]
         item.delete :parameters
         item.delete :enabled
       end
-      item
+      [true, item]
     end
 
     def self.compile_hash(item, settings, job_collection)
       errors = {}
       result = {}
 
-      item = handle_enable item
+      success, item = handle_enable(item, settings, job_collection)
+      return false, item unless success
 
       item.each do |key, value|
         if value.nil?
@@ -133,7 +137,7 @@ module JenkinsPipelineBuilder
           errors[key] = "Failed to resolve:\n===>key: #{key}\n\n===>value: #{value}\n\n===>of: #{item}"
           next
         end
-        result[key] = payload
+        result[key] = payload unless payload == {}
       end
       return false, errors unless errors.empty?
       [true, result]

data/lib/jenkins_pipeline_builder/extensions/wrappers.rb

@@ -216,3 +216,24 @@ wrapper do
     end
   end
 end
+
+wrapper do
+  name :xvfb
+  plugin_id 'xvfb'
+  description 'Setup Xvfb display for Selenium with Firefox.'
+  jenkins_name 'Xvfb'
+  announced false
+
+  xml do |params|
+    send('org.jenkinsci.plugins.xvfb.XvfbBuildWrapper') do
+      installationName 'Default'
+      screen '1024x768x24'
+      debug false
+      self.timeout params[:timeout] || 10 # rubocop:disable Style/RedundantSelf
+      displayNameOffset 1
+      additionalOptions
+      shutdownWithBuild false
+      autoDisplayName false
+    end
+  end
+end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -170,7 +170,7 @@ module JenkinsPipelineBuilder
     def get_columns(type)
       column_names = ['Status', 'Weather', 'Last Success', 'Last Failure', 'Last Duration', 'Build Button']
       if type == 'categorizedView'
-        column_names << 'Categorized - Job'
+        column_names.insert(2, 'Categorized - Job')
       else
         column_names.insert(2, 'Name')
       end

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -36,4 +36,42 @@ describe JenkinsPipelineBuilder::Compiler do
       expect(result[1]).to eq(job0_compiled)
     end
   end
+
+  describe '#enable_blocks' do
+
+    it 'generates correct new jobs with true' do
+      item = { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } }
+      settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
+      job_collection = { '{{name}}-build' => { name: '{{name}}-build', type: :job, value: { name: '{{name}}-build', project_name: '{{name}}', builders: [{ maven3: { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } } }] } }, 'global' => { name: 'global', type: :defaults, value: { name: 'global', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } }, 'PushTest' => { name: 'PushTest', type: :project, value: { name: 'PushTest', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', jobs: [{ :"{{name}}-build" => {} }] }, settings: { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } } }
+      success, item = compiler.handle_enable(item, settings, job_collection)
+      expect(success).to be true
+      expect(item).to eq(rootPom: 'path_to_pomasd')
+    end
+
+    it 'generates correct new jobs with false' do
+      item = { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } }
+      settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: false }
+      job_collection = { '{{name}}-build' => { name: '{{name}}-build', type: :job, value: { name: '{{name}}-build', project_name: '{{name}}', builders: [{ maven3: { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } } }] } }, 'global' => { name: 'global', type: :defaults, value: { name: 'global', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } }, 'PushTest' => { name: 'PushTest', type: :project, value: { name: 'PushTest', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', jobs: [{ :"{{name}}-build" => {} }] }, settings: { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } } }
+      success, item = compiler.handle_enable(item, settings, job_collection)
+      expect(success).to be true
+      expect(item).to eq({})
+    end
+
+    it 'fails when value not found' do
+      item = { enabled: '{{use_fail}}', parameters: { rootPom: 'path_to_pomasd' } }
+      settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true }
+      job_collection = { '{{name}}-build' => { name: '{{name}}-build', type: :job, value: { name: '{{name}}-build', project_name: '{{name}}', builders: [{ maven3: { enabled: '{{use1}}', parameters: { rootPom: 'path_to_pomasd' } } }] } }, 'global' => { name: 'global', type: :defaults, value: { name: 'global', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } }, 'PushTest' => { name: 'PushTest', type: :project, value: { name: 'PushTest', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', jobs: [{ :"{{name}}-build" => {} }] }, settings: { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use1: true } } }
+      success, _ = compiler.handle_enable(item, settings, job_collection)
+      expect(success).to be false
+    end
+
+    it 'removes empty builders' do
+      item = { enabled: '{{use}}', parameters: { rootPom: 'one' } }
+      settings = { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', use: false }
+      job_collection = { '{{name}}-build' => { name: '{{name}}-build', type: :job, value: { name: '{{name}}-build', project_name: '{{name}}', builders: [{ maven3: { enabled: '{{use}}', parameters: { rootPom: 'one' } } }] }, use: false }, 'global' => { name: 'global', type: :defaults, value: { name: 'global', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/' } }, 'PushTest' => { name: 'PushTest', type: :project, value: { name: 'PushTest', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/', jobs: [{ :"{{name}}-build" => { use: false } }] }, settings: { name: 'PushTest', description: 'DB Pipeline tooling', git_repo: 'git@github.roving.com:devops/DBPipeline.git', git_branch: 'master', excluded_user: 'buildmaster', hipchat_room: 'CD Builds', hipchat_auth_token: 'f3e98ed54605b36f56dd2c562e3775', discard_days: '30', discard_number: '100', maven_name: 'tools-maven-3.0.3', hipchat_jenkins_url: 'https://cd-jenkins.ad.prodcc.net/' } } }
+      success, result = compiler.compile_hash(item, settings, job_collection)
+      expect(success).to be true
+      expect(result).to eq({})
+    end
+  end
 end

data/spec/lib/jenkins_pipeline_builder/extensions/wrappers_spec.rb

@@ -46,6 +46,22 @@ describe 'wrappers' do
     end
   end
 
+  context 'xvfb' do
+    before :each do
+      JenkinsPipelineBuilder.registry.registry[:job][:wrappers][:xvfb].installed_version = '0.0'
+    end
+
+    it 'generates correct xml' do
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', { wrappers: { xvfb: {} } }, @n_xml)
+
+      node = @n_xml.root.xpath('//buildWrappers/org.jenkinsci.plugins.xvfb.XvfbBuildWrapper')
+      puts node.inspect
+      t = node.css('timeout')
+      puts t.inspect
+      expect(node.first).to_not be_nil
+    end
+  end
+
   context 'timestamp' do
     before :each do
       JenkinsPipelineBuilder.registry.registry[:job][:wrappers][:timestamp].installed_version = '0.0'

data/spec/lib/jenkins_pipeline_builder/module_registry_spec.rb

@@ -110,7 +110,8 @@ describe JenkinsPipelineBuilder::ModuleRegistry do
         inject_env_var: ['0'],
         artifactory: ['0'],
         maven3artifactory: ['0'],
-        nodejs: ['0']
+        nodejs: ['0'],
+        xvfb: ['0']
       }
       registry = JenkinsPipelineBuilder.registry.registry
       expect(registry[:job][:wrappers].size).to eq wrappers.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri