jenkins_pipeline_builder 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02baf3de6c0875361f96889ca4b97d2416279b33
-  data.tar.gz: 6f1c55c53d76b25bcae5903cb8e9cd881163fb78
+  metadata.gz: dd3fbe192beffd805980b40fc49e45a17fc91573
+  data.tar.gz: 985c10461b9cda3e85736c37a448072d1c360b11
 SHA512:
-  metadata.gz: 5413a1ec062cc1b373decb46b4b3ba1b86aaee0b8ed24c26a00185b81ff165a9a5929fdd3faa5c0e72d46492e0e9c81137a555300247f3f22c9d8c055985ac9f
-  data.tar.gz: c75e91326db794c6a295ba3d720ebfbfb6928c20f2ce2d76650cbbe53b8600714c5233c72208e7580eb8b4efd3ee64961b3080f34b77dffc614aa5400fb5fd14
+  metadata.gz: 9bcc9b579331bddee28a89bfa86e8a0f312dc071ae3e38b31c213d932f6b8744a44bc1dae8381fa552ea166c3a4eb661e22cc5d1e526375812898d9889246062
+  data.tar.gz: d52753724255e12b3662c441278d69a1423095d5661a415577f8578630a5c162c3934f0b8115cfaa657c77d094dc67c524eb4bd4deebb7dadd7a645cd31e6fc3

data/README.md

@@ -145,6 +145,21 @@ Here's a high level overview of what's available:
           goals: -B clean
           rootPom: path_to_pom
           mavenName: maven-name # Optional
+      - remote_job:
+          server: 'Name of Server' # Name of the Remote Jenkins Server
+          job_name: name_of_remote_build 
+          blocking: true # Block current job until remote job finishes
+          polling_interval: 10 # Optional, number of seconds between polls, defaults to 10
+          continue_on_remote_failure: false
+          parameters: # Optional, if both are specified only the file is used
+            file: 'foo.prop'
+            content: |
+              VAR1 = value_1
+              VAR2 = value_2
+          credentials: # Optional, if you want to override the server credentials
+            type: api_token or none
+            username: name_of_user
+            api_token: APITOKEN
     wrappers:
       - timestamp: true
       - ansicolor: true
@@ -204,6 +219,9 @@ Here's a high level overview of what's available:
       - git_push: true
       - scm_polling: 'H/5 * * * *'
       - periodic_build: 'H/15 * * * *'
+      - upstream: # Trigger this build after another build has completed
+          projects: project-name-here
+          status: failed, unstable, stable # Optional, stable by default
     build_flow: |
       guard {
         build("job_name1", param1: params["param1"]);

data/lib/jenkins_pipeline_builder/builders.rb

@@ -71,5 +71,48 @@ module JenkinsPipelineBuilder
         }
       }
     end
+
+    def self.start_remote_job(params, xml)
+      parameters = params[:parameters][:content].split("\n") if params[:parameters] && params[:parameters][:content]
+      xml.send('org.jenkinsci.plugins.ParameterizedRemoteTrigger.RemoteBuildConfiguration', 'plugin'=>'Parameterized-Remote-Trigger'){
+        xml.remoteJenkinsName params[:server]
+        xml.job params[:job_name]
+        xml.shouldNotFailBuild params[:continue_on_remote_failure] if params[:continue_on_remote_failure]
+        xml.pollInterval params[:polling_interval] if params[:polling_interval]
+        xml.blockBuildUntilComplete params[:blocking] if params[:blocking]
+        xml.token
+        if params[:parameters] && params[:parameters][:content]
+          xml.parameters parameters.join("\n")
+          xml.parameterList{
+            parameters.each do |p|
+              xml.string p
+            end
+          }
+        elsif params[:parameters] && params[:parameters][:file]
+          xml.loadParamsFromFile 'true' 
+          xml.parameterFile params[:parameters][:file]
+        else
+          xml.parameters
+          xml.parameterList{
+            xml.string
+          }
+        end
+        if params[:credentials] && params[:credentials][:type]
+          xml.overrideAuth 'true'
+          xml.auth{
+            xml.send('org.jenkinsci.plugins.ParameterizedRemoteTrigger.Auth'){
+              if params[:credentials][:type]=="api_token"
+                xml.authType 'apiToken'
+                xml.username params[:credentials][:username]
+                xml.API__TOKEN params[:credentials][:api_token]
+              else
+                xml.authType 'none'
+              end
+            }
+          }
+        end
+      }
+    end
+
   end
 end

data/lib/jenkins_pipeline_builder/cli/pipeline.rb

@@ -32,8 +32,8 @@ module JenkinsPipelineBuilder
       end
 
       desc 'bootstrap Path', 'Generates pipeline from folder or a file'
-      def bootstrap(path)
-        Helper.setup(parent_options).bootstrap(path)
+      def bootstrap(path, project_name = nil)
+        Helper.setup(parent_options).bootstrap(path, project_name)
       end
     end
   end

data/lib/jenkins_pipeline_builder/generator.rb

@@ -57,7 +57,8 @@ module JenkinsPipelineBuilder
                       multi_job: Builders.method(:build_multijob),
                       inject_vars_file: Builders.method(:build_environment_vars_injector),
                       shell_command: Builders.method(:build_shell_command),
-                      maven3: Builders.method(:build_maven3)
+                      maven3: Builders.method(:build_maven3),
+                      remote_job: Builders.method(:start_remote_job)
                   },
                   method:
                     lambda { |registry, params, n_xml| @module_registry.run_registry_on_path('//builders', registry, params, n_xml) }
@@ -93,7 +94,8 @@ module JenkinsPipelineBuilder
                   registry: {
                       git_push: Triggers.method(:enable_git_push),
                       scm_polling: Triggers.method(:enable_scm_polling),
-                      periodic_build: Triggers.method(:enable_periodic_build)
+                      periodic_build: Triggers.method(:enable_periodic_build),
+                      upstream: Triggers.method(:enable_upstream_check)
                   }, 
                   method:
                     lambda { |registry, params, n_xml| @module_registry.run_registry_on_path('//triggers', registry, params, n_xml) }
@@ -240,7 +242,7 @@ module JenkinsPipelineBuilder
       return result
     end
 
-    def bootstrap(path)
+    def bootstrap(path, project_name)
       @logger.info "Bootstrapping pipeline from path #{path}"
       load_collection_from_path(path)
 
@@ -259,32 +261,34 @@ module JenkinsPipelineBuilder
       else
         projects.each do |project|
           success, payload = resolve_project(project)
-          if success
-            puts 'successfully resolved project'
-            compiled_project = payload
-          else
-            puts payload
-            return false
-          end
+          if payload[:value][:name] == project_name || project_name == nil # If we specify a project name, only use that project
+            if success
+              puts 'successfully resolved project'
+              compiled_project = payload
+            else
+              puts payload
+              return false
+            end
 
-          if compiled_project[:value][:jobs]
-            compiled_project[:value][:jobs].each do |i|
-              puts "Processing #{i}"
-              job = i[:result]
-              fail "Result is empty for #{i}" if job.nil?
-              success, payload = compile_job_to_xml(job)
-              if success
-                create_or_update(job, payload)
-              else
-                errors[job[:name]] = payload
+            if compiled_project[:value][:jobs]
+              compiled_project[:value][:jobs].each do |i|
+                puts "Processing #{i}"
+                job = i[:result]
+                fail "Result is empty for #{i}" if job.nil?
+                success, payload = compile_job_to_xml(job)
+                if success
+                  create_or_update(job, payload)
+                else
+                  errors[job[:name]] = payload
+                end
               end
             end
-          end
 
-          if compiled_project[:value][:views]
-            compiled_project[:value][:views].each do |v|
-              _view = v[:result]
-              view.create(_view)
+            if compiled_project[:value][:views]
+              compiled_project[:value][:views].each do |v|
+                _view = v[:result]
+                view.create(_view)
+              end
             end
           end
         end

data/lib/jenkins_pipeline_builder/triggers.rb

@@ -41,5 +41,32 @@ module JenkinsPipelineBuilder
       }
     end
 
+    def self.enable_upstream_check(params, xml)
+      case params[:status]
+      when "unstable"
+        name = "UNSTABLE"
+        ordinal = "1"
+        color = "yellow"
+      when "failed"
+        name = "FAILURE"
+        ordinal = "2"
+        color = "RED"
+      else
+        name = "SUCCESS"
+        ordinal = "0"
+        color = "BLUE"
+      end
+      xml.send('jenkins.triggers.ReverseBuildTrigger') {
+        xml.spec
+        xml.upstreamProjects params[:projects]
+        xml.send('threshold'){
+          xml.name name
+          xml.ordinal ordinal
+          xml.color color
+          xml.completeBuild true
+        }
+      }
+    end
+
   end
 end

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/spec/unit_tests/fixtures/files/remote_job.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders><org.jenkinsci.plugins.ParameterizedRemoteTrigger.RemoteBuildConfiguration plugin="Parameterized-Remote-Trigger"><remoteJenkinsName>Server2</remoteJenkinsName><job>name_of_remote_build</job><pollInterval>10</pollInterval><blockBuildUntilComplete>true</blockBuildUntilComplete><token/><parameters>VAR1 = value_1
+ VAR2 = value_2</parameters><parameterList><string>VAR1 = value_1</string><string>VAR2 = value_2</string></parameterList><overrideAuth>true</overrideAuth><auth><org.jenkinsci.plugins.ParameterizedRemoteTrigger.Auth><authType>apiToken</authType><username>user_name_here</username><API__TOKEN>RAWR123ROVING</API__TOKEN></org.jenkinsci.plugins.ParameterizedRemoteTrigger.Auth></auth></org.jenkinsci.plugins.ParameterizedRemoteTrigger.RemoteBuildConfiguration></builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/spec/unit_tests/fixtures/files/remote_job.yaml

@@ -0,0 +1,19 @@
+- job_template:
+    name: remote-job
+    job_type: free_style
+    builders:
+      - remote_job:
+          server: 'Server2' 
+          job_name: name_of_remote_build 
+          blocking: true 
+          polling_interval: 10 
+          continue_on_remote_failure: false
+          parameters: 
+            file: 'foo.prop'
+            content: |
+              VAR1 = value_1
+              VAR2 = value_2
+          credentials:
+            type: api_token
+            username: user_name_here
+            api_token: RAWR123ROVING

data/spec/unit_tests/fixtures/files/upstream.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"><jenkins.triggers.ReverseBuildTrigger><spec/><upstreamProjects>UpstreamProject</upstreamProjects><threshold><name>FAILURE</name><ordinal>2</ordinal><color>RED</color><completeBuild>true</completeBuild></threshold></jenkins.triggers.ReverseBuildTrigger></triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>

data/spec/unit_tests/fixtures/files/upstream.yaml

@@ -0,0 +1,7 @@
+---
+- job:
+    name: upstream
+    triggers: 
+      - upstream:
+          projects: UpstreamProject
+          status: failed

data/spec/unit_tests/generator_spec.rb

@@ -35,8 +35,10 @@ describe 'Test YAML jobs conversion to XML' do
       'post_build_script',
       'properties_file',
       'downstream',
+      'upstream',
       'rvm05',
       'prepare_environment',
+      'remote_job',
       'throttle',
       'specific_priority',
       'periodic_build',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Igor Moochnick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -334,12 +334,16 @@ files:
 - spec/unit_tests/fixtures/files/project.yaml
 - spec/unit_tests/fixtures/files/properties_file.xml
 - spec/unit_tests/fixtures/files/properties_file.yaml
+- spec/unit_tests/fixtures/files/remote_job.xml
+- spec/unit_tests/fixtures/files/remote_job.yaml
 - spec/unit_tests/fixtures/files/rvm05.xml
 - spec/unit_tests/fixtures/files/rvm05.yaml
 - spec/unit_tests/fixtures/files/specific_priority.xml
 - spec/unit_tests/fixtures/files/specific_priority.yaml
 - spec/unit_tests/fixtures/files/throttle.xml
 - spec/unit_tests/fixtures/files/throttle.yaml
+- spec/unit_tests/fixtures/files/upstream.xml
+- spec/unit_tests/fixtures/files/upstream.yaml
 - spec/unit_tests/fixtures/templates/external_job.yaml
 - spec/unit_tests/fixtures/templates/project_with_jobs.yaml
 - spec/unit_tests/generator_spec.rb
@@ -402,12 +406,16 @@ test_files:
 - spec/unit_tests/fixtures/files/project.yaml
 - spec/unit_tests/fixtures/files/properties_file.xml
 - spec/unit_tests/fixtures/files/properties_file.yaml
+- spec/unit_tests/fixtures/files/remote_job.xml
+- spec/unit_tests/fixtures/files/remote_job.yaml
 - spec/unit_tests/fixtures/files/rvm05.xml
 - spec/unit_tests/fixtures/files/rvm05.yaml
 - spec/unit_tests/fixtures/files/specific_priority.xml
 - spec/unit_tests/fixtures/files/specific_priority.yaml
 - spec/unit_tests/fixtures/files/throttle.xml
 - spec/unit_tests/fixtures/files/throttle.yaml
+- spec/unit_tests/fixtures/files/upstream.xml
+- spec/unit_tests/fixtures/files/upstream.yaml
 - spec/unit_tests/fixtures/templates/external_job.yaml
 - spec/unit_tests/fixtures/templates/project_with_jobs.yaml
 - spec/unit_tests/generator_spec.rb