jenkins_pipeline_builder 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2435d7d3bfbce44945a8ac65b3a2e974447659aa
-  data.tar.gz: 91f22ff5ea5254f056d3ebbd2966b2ddb1a968d2
+  metadata.gz: 0e6d66b2aeb97ff13d1857f917d40823f04a0475
+  data.tar.gz: c65360bb36f9b0b75c726d069672dbfdd701887d
 SHA512:
-  metadata.gz: e3eaad5a500bbe56cfd70dac4d56ee3834d041e935b984386432b0d84e7eacc2db8541348f79d19e083a0e412089232d36cc5400d7f646e00a6eda8cbfb90936
-  data.tar.gz: 8b55b43d229e060aca4165941242acdbaca512ad3b645314c76a13ac780496ee65312952fcf2aab456fbe46cfb4def734f41eed798efe7fc6bba4e5c30e56acb
+  metadata.gz: 4cfefd6a9a7955b33858657599a9899d91c32b304d631f86f184c7f90321409754d182eda1bf8ee11209fc448067d7c51b10cc6a3cd6420f664a03d06f4bdc27
+  data.tar.gz: 5221d04269f542077e959f047f01f0062767d0a9f8e3b3f8a1be145760063b430f6b78d2786fba06c9232b8497e14381f8144448de172767bcab216c4cbad07b

data/lib/jenkins_pipeline_builder/extensions/builders.rb

@@ -377,31 +377,79 @@ builder do
       filterPattern params[:filterPattern]
     end
   end
+end
+
+builder do
+  name :sonar_standalone
+  plugin_id 'sonar'
+  description 'The plugin allows you to trigger SonarQube analysis from Jenkins using a Post-build action to trigger the analysis with MavenQuickly benefit from Sonar, the open source platform for Continuous Inspection of code quality.'
+  jenkins_name 'SonarQube Plugin'
+  announced false
+  parameters [
+    :sonarInstallation,
+    :taskToRun,
+    :jdk,
+    :pathToProjectProperties,
+    :projectProperties,
+    :jvmOptions
+  ]
 
-  builder do
-    name :sonar_standalone
-    plugin_id 'sonar'
-    description 'Quickly benefit from Sonar, the open source platform for Continuous Inspection of code quality.'
-    jenkins_name 'SonarQube Plugin'
-    announced false
-    parameters [
-      :sonarInstallation,
-      :taskToRun,
-      :jdk,
-      :pathToProjectProperties,
-      :projectProperties,
-      :jvmOptions
-    ]
+  xml do |params|
+    send('hudson.plugins.sonar.SonarRunnerBuilder', 'plugin' => 'sonar@2.1') do
+      installationName params[:sonarInstallation]
+      jdk params[:jdk] || '(Inherit From Job)'
+      project params[:pathToProjectProperties]
+      properties params[:projectProperties]
+      javaOpts params[:jvmOptions]
+      task params[:taskToRun]
+    end
+  end
+end
 
-    xml do |params|
-      send('hudson.plugins.sonar.SonarRunnerBuilder', 'plugin' => 'sonar@2.1') do
-        installationName params[:sonarInstallation]
-        project params[:pathToProjectProperties]
-        properties params[:projectProperties]
-        javaOpts params[:jvmOptions]
-        jdk params[:jdk]
-        task params[:taskToRun]
+builder do
+  name :conditional_multijob_step
+  plugin_id 'conditional-buildstep'
+  description 'description'
+  jenkins_name 'Conditional Build Step'
+  announced false
+
+  xml do |params|
+    send('org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder', 'plugin' => 'conditional-buildstep@1.3.3') do
+      condition('class' => 'org.jenkins_ci.plugins.run_condition.contributed.ShellCondition', 'plugin' => 'run-condition@1.0') do
+        command params[:conditional_shell]
+      end
+      params[:phases].each do |name, content|
+        buildStep('class' => 'com.tikal.jenkins.plugins.multijob.MultiJobBuilder', 'plugin' => 'jenkins-multijob-plugin@1.13') do
+          phaseName name
+          phaseJobs do
+            content[:jobs].each do |job|
+              send('com.tikal.jenkins.plugins.multijob.PhaseJobsConfig') do
+                jobName job[:name]
+                currParams job[:current_params] || false
+                exposedSCM job[:exposed_scm] || false
+                if job[:config]
+                  configs do
+                    if job[:config].key? :predefined_build_parameters
+                      send('hudson.plugins.parameterizedtrigger.PredefinedBuildParameters') do
+                        properties job[:config][:predefined_build_parameters]
+                      end
+                    end
+                    if job[:config].key? :properties_file
+                      send('hudson.plugins.parameterizedtrigger.FileBuildParameters') do
+                        propertiesFile job[:config][:properties_file][:file]
+                        failTriggerOnMissing job[:config][:properties_file][:skip_if_missing] || 'false'
+                      end
+                    end
+                  end
+                end
+                killPhaseOnJobResultCondition job[:kill_phase_on] || 'FAILURE'
+              end
+            end
+          end
+          continuationCondition content[:continue_condition] || 'SUCCESSFUL'
+        end
       end
+      runner('class' => 'org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail', 'plugin' => 'run-condition@1.0')
     end
   end
 end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.16.2'.freeze
 end

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

@@ -100,6 +100,33 @@ describe 'builders' do
     end
   end
 
+  context 'sonar_standalone' do
+    before :each do
+      allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
+        list_installed: { 'sonar' => '2.1' }
+      )
+    end
+
+    it 'generates a configuration' do
+      params = { builders: { sonar_standalone: { pathToProjectProperties: 'sonar-project.properties' } } }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      builder = @n_xml.root.children.first
+      expect(builder.name).to match 'hudson.plugins.sonar.SonarRunnerBuilder'
+      expect(@n_xml.root.css('project').first.text).to eq 'sonar-project.properties'
+      expect(@n_xml.root.css('jdk').first.text).to eq '(Inherit From Job)'
+    end
+
+    it 'allows the JDK default to be overriden' do
+      params = { builders: { sonar_standalone: { jdk: '9', pathToProjectProperties: 'sonar-project.properties' } } }
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+
+      expect(@n_xml.root.css('jdk').first.text).to eq '9'
+    end
+  end
+
   context 'blocking_downstream' do
     before :each do
       allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
@@ -209,4 +236,80 @@ describe 'builders' do
       end
     end
   end
+
+  context 'conditional_multijob_step' do
+    let(:default_params) do
+      {
+        builders: {
+          conditional_multijob_step: {
+            conditional_shell: 'echo',
+            phases: {
+              myphase1: {
+                jobs: [
+                  {
+                    name: 'myjob1',
+                    config: {
+                      predefined_build_parameters: 'X=Y\nR=Z'
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    end
+    let(:base_x_path) do
+      '//org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder'
+    end
+    let(:build_step_x_path) do
+      "#{base_x_path}/buildStep"
+    end
+    let(:phase_jobs_x_path) do
+      "#{build_step_x_path}/phaseJobs/com.tikal.jenkins.plugins.multijob.PhaseJobsConfig"
+    end
+
+    before :each do
+      allow(JenkinsPipelineBuilder.client).to receive(:plugin).and_return double(
+        list_installed: { 'conditional-buildstep' => '1.3.3' }
+      )
+    end
+
+    it 'generates a configuration' do
+      params = default_params
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      builder = @n_xml.root.children.first
+      expect(builder.name).to match 'org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder'
+      command = @n_xml.xpath base_x_path
+      expect(command.first.content).to match 'echo'
+    end
+
+    it 'creates a phase' do
+      params = default_params
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      phase_name = @n_xml.xpath "#{build_step_x_path}/phaseName"
+      expect(phase_name.first.content).to match 'myphase1'
+      phase_continue = @n_xml.xpath "#{build_step_x_path}/continuationCondition"
+      expect(phase_continue.first.content).to match 'SUCCESSFUL'
+    end
+
+    it 'creates a job' do
+      params = default_params
+
+      JenkinsPipelineBuilder.registry.traverse_registry_path('job', params, @n_xml)
+      job_name = @n_xml.xpath "#{phase_jobs_x_path}/jobName"
+      expect(job_name.first.content).to match 'myjob1'
+      curr_params = @n_xml.xpath "#{phase_jobs_x_path}/currParams"
+      expect(curr_params.first.content).to match 'false'
+      exposed_scm = @n_xml.xpath "#{phase_jobs_x_path}/exposedSCM"
+      expect(exposed_scm.first.content).to match 'false'
+      predefined_params = @n_xml.xpath "#{phase_jobs_x_path}/"\
+        'configs/hudson.plugins.parameterizedtrigger.PredefinedBuildParameters'
+      expect(predefined_params.first.content).to match 'X=Y\nR=Z'
+      kill_phase_cond = @n_xml.xpath "#{phase_jobs_x_path}/killPhaseOnJobResultCondition"
+      expect(kill_phase_cond.first.content).to match 'FAILURE'
+    end
+
+    # TODO: More tests
+  end
 end

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

@@ -43,7 +43,8 @@ BUILDERS = {
   shell_command: ['0'],
   checkmarx_scan: ['0'],
   system_groovy: ['0'],
-  sonar_standalone: ['0']
+  sonar_standalone: ['0'],
+  conditional_multijob_step: ['0']
 }.freeze
 
 TRIGGERS = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri