jenkins_pipeline_builder 0.10.12 → 0.10.13

data/lib/jenkins_pipeline_builder/job.rb

@@ -44,6 +44,7 @@ module JenkinsPipelineBuilder
         @xml = setup_freestyle_base(job)
         payload = update_job_dsl
       when 'multi_project'
+        # TODO: Add multi_job as another, more logically named option
         @xml = setup_freestyle_base(job)
         payload = adjust_multi_project
       when 'build_flow'

data/lib/jenkins_pipeline_builder/job_collection.rb

@@ -23,6 +23,10 @@ module JenkinsPipelineBuilder
       result
     end
 
+    def standalone_jobs
+      jobs.map { |job| { result: job } }
+    end
+
     def jobs
       result = []
       collection.values.each do |item|
@@ -49,29 +53,27 @@ module JenkinsPipelineBuilder
       if File.directory?(path)
         logger.info "Generating from folder #{path}"
         Dir[File.join(path, '/*.{yaml,yml}')].each do |file|
-          logger.info "Loading file #{file}"
-          yaml = YAML.load_file(file)
-          load_file(yaml, remote)
+          load_file(file, remote)
         end
         Dir[File.join(path, '/*.json')].each do |file|
-          logger.info "Loading file #{file}"
-          json = JSON.parse(IO.read(file))
-          load_file(json, remote)
+          load_file(file, remote)
         end
       else
-        logger.info "Loading file #{path}"
-        if path.end_with? 'json'
-          hash = JSON.parse(IO.read(path))
-        else  # elsif path.end_with?("yml") || path.end_with?("yaml")
-          hash = YAML.load_file(path)
-        end
-        load_file(hash, remote)
+        load_file(path, remote)
       end
       remote_dependencies.cleanup if remote
     end
 
-    def load_file(yaml, remote = false)
-      yaml.each do |section|
+    private
+
+    def load_file(path, remote = false)
+      if path.end_with? 'json'
+        hash = JSON.parse(IO.read(path))
+      else  # elsif path.end_with?("yml") || path.end_with?("yaml")
+        hash = YAML.load_file(path)
+      end
+      logger.info "Loading file #{path}"
+      hash.each do |section|
         Utils.symbolize_keys_deep!(section)
         key = section.keys.first
         value = section[key]

data/lib/jenkins_pipeline_builder/module_registry.rb

@@ -93,7 +93,7 @@ module JenkinsPipelineBuilder
         if reg_value.is_a? ExtensionSet
           ext = reg_value.extension
           logger.debug "Using #{ext.type} #{ext.name} version #{ext.min_version}"
-          success = execute_extension ext, value, n_xml
+          success = ext.execute value, n_xml
           fail 'Encountered errors compiling the xml' unless success
         elsif value.is_a? Hash
           traverse_registry reg_value, value, n_xml, true
@@ -104,30 +104,5 @@ module JenkinsPipelineBuilder
         end
       end
     end
-
-    def execute_extension(extension, value, n_xml)
-      errors = []
-      params = extension.parameters
-      if params == false || params.any?
-        if value.is_a? Hash
-          value.each_key do |key|
-            next if params && params.include?(key)
-            errors << "Extension #{extension.name} does not support parameter #{key}"
-          end
-        end
-      end
-      errors.each do |error|
-        logger.error error
-      end
-      return false if errors.any?
-
-      n_builders = n_xml.xpath(extension.path).first
-      n_builders.instance_exec(value, &extension.before) if extension.before
-      Nokogiri::XML::Builder.with(n_builders) do |xml|
-        xml.instance_exec value, &extension.xml
-      end
-      n_builders.instance_exec(value, &extension.after) if extension.after
-      true
-    end
   end
 end

data/lib/jenkins_pipeline_builder/pull_request.rb

@@ -24,24 +24,20 @@ module JenkinsPipelineBuilder
     attr_reader :project    # The root project YAML as a hash
     attr_reader :number     # The pull request number
     attr_reader :jobs       # The jobs in the pull request as an array of hashes
-    attr_reader :generator  # The generator job YAML as a hash
+    attr_reader :pull_generator  # The generator job YAML as a hash
 
-    # Initialize
-    def initialize(project, number, jobs, generator)
-      # Set instance vars
+    def initialize(project, number, jobs, pull_generator)
       @project = Marshal.load(Marshal.dump(project))
       @number = number
       @jobs = Marshal.load(Marshal.dump(jobs))
-      @generator = Marshal.load(Marshal.dump(generator))
+      @pull_generator = Marshal.load(Marshal.dump(pull_generator))
       @project[:value][:pull_request_number] = "#{@number}"
 
-      # Run
       run!
     end
 
     private
 
-    # Apply all changes
     def run!
       git_version = JenkinsPipelineBuilder.registry.registry[:job][:scm_params].installed_version
       if git_version >= Gem::Version.new(2.0)
@@ -64,7 +60,8 @@ module JenkinsPipelineBuilder
       @jobs.each_value do |job|
         job[:value][:scm_branch] = 'origin/pr/{{pull_request_number}}/head'
         job[:value][:scm_params] = {} unless job[:value][:scm_params]
-        job[:value][:scm_params][:refspec] = 'refs/pull/*:refs/remotes/origin/pr/*'
+        refspec = 'refs/pull/{{pull_request_number}}/head:refs/remotes/origin/pr/{{pull_request_number}}/head'
+        job[:value][:scm_params][:refspec] = refspec
       end
     end
 
@@ -79,8 +76,7 @@ module JenkinsPipelineBuilder
       @jobs.each_value do |job|
         name = job[:name]
         changes = nil
-        # Search the generator for changes
-        @generator[:jobs].each do |gen|
+        @pull_generator[:value][:jobs].each do |gen|
           changes = gen[name.to_sym] if gen.is_a?(Hash) && gen.keys[0] == name.to_sym
         end
         # Apply changes

data/lib/jenkins_pipeline_builder/pull_request_generator.rb

@@ -22,20 +22,44 @@
 
 module JenkinsPipelineBuilder
   class PullRequestGenerator
-    attr_reader :purge
-    attr_reader :create
-    attr_reader :jobs
+    attr_reader :purge, :create, :jobs, :project, :generator, :pull_generator, :errors, :pull_requests
+
+    def initialize(project, generator)
+      @project = project
+      @generator = generator
 
-    def initialize(project, jobs, pull_job)
       @purge = []
       @create = []
-      @jobs = {}
 
-      pull_requests = check_for_pull pull_job
-      purge_old(pull_requests, project)
-      pull_requests.each do |number|
-        # Manipulate the YAML
-        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, pull_job)
+      @errors = {}
+      @pull_generator = find
+      success, payload = compile_generator
+      unless success
+        @errors[@pull_generator[:name]] = payload
+        return false
+      end
+      @jobs = filter_jobs
+
+      # old init
+      @pull_requests = check_for_pull payload
+      find_old_pull_requests
+      generate_pull_requests
+
+      @generator.job_collection.collection.merge! @jobs
+      @errors.merge! create_jobs
+
+      purge_jobs
+    end
+
+    def valid?
+      errors.empty?
+    end
+
+    private
+
+    def generate_pull_requests
+      @pull_requests.each do |number|
+        req = JenkinsPipelineBuilder::PullRequest.new(project, number, jobs, @pull_generator)
         @jobs.merge! req.jobs
         project_new = req.project
 
@@ -45,7 +69,63 @@ module JenkinsPipelineBuilder
       end
     end
 
-    private
+    def purge_jobs
+      purge.each do |purge_job|
+        jobs = JenkinsPipelineBuilder.client.job.list "#{purge_job}.*"
+        jobs.each do |job|
+          JenkinsPipelineBuilder.client.job.delete job
+        end
+      end
+    end
+
+    def create_jobs
+      errors = {}
+      create.each do |pull_project|
+        success, compiled_project = generator.resolve_project(pull_project)
+        compiled_project[:value][:jobs].each do |i|
+          job = i[:result]
+          job = Job.new job
+          success, payload = job.create_or_update
+          errors[job.name] = payload unless success
+        end
+      end
+      errors
+    end
+
+    def filter_jobs
+      jobs = {}
+      pull_jobs = pull_generator[:value][:jobs] || []
+      pull_jobs.each do |job|
+        if job.is_a? String
+          jobs[job.to_s] = generator.job_collection.collection[job.to_s]
+        else
+          jobs[job.keys.first.to_s] = generator.job_collection.collection[job.keys.first.to_s]
+        end
+      end
+      fail 'No jobs found for pull request' if jobs.empty?
+      jobs
+    end
+
+    def compile_generator
+      defaults = generator.job_collection.defaults
+      settings = defaults.nil? ? {} : defaults[:value] || {}
+      compiler = Compiler.new generator
+      settings = compiler.get_settings_bag(project, settings)
+      generator.resolve_job_by_name(pull_generator[:name], settings)
+    end
+
+    def find
+      project_jobs = project[:value][:jobs] || []
+      pull_job = nil
+      project_jobs.each do |job|
+        job = job.keys.first if job.is_a? Hash
+        job = generator.job_collection.collection[job.to_s]
+
+        pull_job = job if job[:value][:job_type] == 'pull_request_generator'
+      end
+      fail 'No jobs of type pull_request_generator found' unless pull_job
+      pull_job
+    end
 
     # Check for Github Pull Requests
     #
@@ -64,10 +144,10 @@ module JenkinsPipelineBuilder
       pulls.map { |p| p['number'] }
     end
 
-    # Purge old builds
-    def purge_old(pull_requests, project)
+    def find_old_pull_requests
       reqs = pull_requests.clone.map { |req| "#{project[:name]}-PR#{req}" }
       # Read File
+      # FIXME: Shouldn't this be opening just with read permissions?
       old_requests = File.new('pull_requests.csv', 'a+').read.split(',')
 
       # Pop off current pull requests

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.10.12'
+  VERSION = '0.10.13'
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -187,26 +187,16 @@ module JenkinsPipelineBuilder
         'Status' => { 'stapler-class' => 'hudson.views.StatusColumn', 'kind' => 'hudson.views.StatusColumn' },
         'Weather' => { 'stapler-class' => 'hudson.views.WeatherColumn', 'kind' => 'hudson.views.WeatherColumn' },
         'Name' => { 'stapler-class' => 'hudson.views.JobColumn', 'kind' => 'hudson.views.JobColumn' },
-        'Last Success' => {
-          'stapler-class' => 'hudson.views.LastSuccessColumn',
-          'kind' => 'hudson.views.LastSuccessColumn'
-        },
-        'Last Failure' => {
-          'stapler-class' => 'hudson.views.LastFailureColumn',
-          'kind' => 'hudson.views.LastFailureColumn'
-        },
-        'Last Duration' => {
-          'stapler-class' => 'hudson.views.LastDurationColumn',
-          'kind' => 'hudson.views.LastDurationColumn'
-        },
-        'Build Button' => {
-          'stapler-class' => 'hudson.views.BuildButtonColumn',
-          'kind' => 'hudson.views.BuildButtonColumn'
-        },
-        'Categorized - Job' => {
-          'stapler-class' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn',
-          'kind' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn'
-        }
+        'Last Success' => { 'stapler-class' => 'hudson.views.LastSuccessColumn',
+                            'kind' => 'hudson.views.LastSuccessColumn' },
+        'Last Failure' => { 'stapler-class' => 'hudson.views.LastFailureColumn',
+                            'kind' => 'hudson.views.LastFailureColumn' },
+        'Last Duration' => { 'stapler-class' => 'hudson.views.LastDurationColumn',
+                             'kind' => 'hudson.views.LastDurationColumn' },
+        'Build Button' => { 'stapler-class' => 'hudson.views.BuildButtonColumn',
+                            'kind' => 'hudson.views.BuildButtonColumn' },
+        'Categorized - Job' => { 'stapler-class' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn',
+                                 'kind' => 'org.jenkinsci.plugins.categorizedview.IndentedJobColumn' }
       }
     end
 

data/spec/lib/jenkins_pipeline_builder/compiler_spec.rb

@@ -9,18 +9,26 @@ describe JenkinsPipelineBuilder::Compiler do
       log_location: '/dev/null'
     }
   end
-  let(:compiler) { JenkinsPipelineBuilder::Compiler }
-  let(:settings_project) { { name: 'DummyPipeline', type: :project, value: { name: 'DummyPipeline', jobs: ['{{name}}-00', { '{{name}}-01' => { job_name: '{{name}}-02' } }] } } }
+  let(:generator) { double(job_collection: double(collection: job_collection)) }
+  let(:compiler) { JenkinsPipelineBuilder::Compiler.new generator }
   let(:settings_global) { { name: 'global', description: 'Do not edit this job through the web!', discard_days: '14', pipeline_repo: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', pipeline_branch: 'master' } }
   let(:settings_bag) { { name: 'DummyPipeline', description: 'Do not edit this job through the web!', discard_days: '14', pipeline_repo: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', pipeline_branch: 'master' } }
-  let(:job0) { { name: '{{name}}-00', description: '{{description}}', scm_provider: 'git', scm_url: '{{pipeline_repo}}', scm_branch: '{{pipeline_branch}}', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running {{name}}'\necho 'About to run {{job@{{name}}-01}}'\n" }], publishers: [{ downstream: { project: '{{job@{{name}}-01}}' } }] } }
-  let(:job0_compiled) { { name: 'DummyPipeline-00', description: 'Do not edit this job through the web!', scm_provider: 'git', scm_url: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', scm_branch: 'master', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running DummyPipeline'\necho 'About to run DummyPipeline-02'\n" }], publishers: [{ downstream: { project: 'DummyPipeline-02' } }] } }
-  let(:job2) { { name: '{{name}}-02', description: '{{description}}', scm_provider: 'git', scm_url: '{{pipeline_repo}}', scm_branch: '{{pipeline_branch}}', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running {{name}}'" }] } }
-  let(:job2_compiled) { { name: 'DummyPipeline-02', description: 'Do not edit this job through the web!', scm_provider: 'git', scm_url: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', scm_branch: 'master', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running DummyPipeline'" }] } }
   let(:job_collection) { { '{{name}}-00' => { name: '{{name}}-00', type: :job, value: { name: '{{name}}-00', description: '{{description}}', scm_provider: 'git', scm_url: '{{pipeline_repo}}', scm_branch: '{{pipeline_branch}}', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running {{name}}'\necho 'About to run {{job@{{name}}-01}}'\n" }], publishers: [{ downstream: { project: '{{job@{{name}}-01}}' } }] } }, '{{name}}-01' => { name: '{{name}}-01', type: :job, value: { name: '{{name}}-02', description: '{{description}}', scm_provider: 'git', scm_url: '{{pipeline_repo}}', scm_branch: '{{pipeline_branch}}', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running {{name}}'" }] }, job_name: '{{name}}-02' }, 'global' => { name: 'global', type: :defaults, value: { name: 'global', description: 'Do not edit this job through the web!', discard_days: '14', pipeline_repo: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', pipeline_branch: 'master' } }, 'DummyPipeline' => { name: 'DummyPipeline', type: :project, value: { name: 'DummyPipeline', jobs: [{ '{{name}}-00' => {}, result: { name: 'DummyPipeline-00', description: 'Do not edit this job through the web!', scm_provider: 'git', scm_url: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', scm_branch: 'master', scm_params: { remote_name: 'origin', skip_tag: true }, wrappers: [{ ansicolor: true }], builders: [{ shell_command: "echo 'Running DummyPipeline'\necho 'About to run DummyPipeline-02'\n" }], publishers: [{ downstream: { project: 'DummyPipeline-02' } }] } }, { '{{name}}-01' => { job_name: '{{name}}-02' } }] }, settings: { name: 'DummyPipeline', description: 'Do not edit this job through the web!', discard_days: '14', pipeline_repo: 'git@github.com:constantcontact/jenkins_pipeline_builder.git', pipeline_branch: 'master' } } } }
 
   describe '#get_settings_bag' do
     it 'merge settings' do
+      settings_project = {
+        name: 'DummyPipeline',
+        type: :project,
+        value: {
+          name: 'DummyPipeline',
+          jobs: [
+            '{{name}}-00',
+            { '{{name}}-01' => { job_name: '{{name}}-02' }
+          }
+          ]
+        }
+      }
       settings = compiler.get_settings_bag(settings_project, settings_global)
       expect(settings).to eq(settings_bag)
     end
@@ -28,13 +36,67 @@ describe JenkinsPipelineBuilder::Compiler do
 
   describe '#compile' do
     it 'compiles a job with a name change' do
-      result = compiler.compile(job2, settings_bag, job_collection)
-      expect(result[1]).to eq(job2_compiled)
+      job = {
+        name: '{{name}}-02',
+        description: '{{description}}',
+        scm_provider: 'git',
+        scm_url: '{{pipeline_repo}}',
+        scm_branch: '{{pipeline_branch}}',
+        scm_params: {
+          remote_name: 'origin',
+          skip_tag: true
+        },
+        wrappers: [{ ansicolor: true }],
+        builders: [{ shell_command: "echo 'Running {{name}}'" }]
+      }
+      job_compiled = {
+        name: 'DummyPipeline-02',
+        description: 'Do not edit this job through the web!',
+        scm_provider: 'git',
+        scm_url: 'git@github.com:constantcontact/jenkins_pipeline_builder.git',
+        scm_branch: 'master',
+        scm_params: {
+          remote_name: 'origin',
+          skip_tag: true
+        },
+        wrappers: [{ ansicolor: true }],
+        builders: [{ shell_command: "echo 'Running DummyPipeline'" }]
+      }
+      result = compiler.compile(job, settings_bag)
+      expect(result[1]).to eq(job_compiled)
     end
 
     it 'compiles a job with a downstream name change' do
-      result = compiler.compile(job0, settings_bag, job_collection)
-      expect(result[1]).to eq(job0_compiled)
+      job = {
+        name: '{{name}}-00',
+        description: '{{description}}',
+        scm_provider: 'git',
+        scm_url: '{{pipeline_repo}}',
+        scm_branch: '{{pipeline_branch}}',
+        scm_params: {
+          remote_name: 'origin',
+          skip_tag: true
+        },
+        wrappers: [{ ansicolor: true }],
+        builders: [{ shell_command: "echo 'Running {{name}}'\necho 'About to run {{job@{{name}}-01}}'\n" }],
+        publishers: [{ downstream: { project: '{{job@{{name}}-01}}' } }]
+      }
+      job_compiled = {
+        name: 'DummyPipeline-00',
+        description: 'Do not edit this job through the web!',
+        scm_provider: 'git',
+        scm_url: 'git@github.com:constantcontact/jenkins_pipeline_builder.git',
+        scm_branch: 'master',
+        scm_params: {
+          remote_name: 'origin',
+          skip_tag: true
+        },
+        wrappers: [{ ansicolor: true }],
+        builders: [{ shell_command: "echo 'Running DummyPipeline'\necho 'About to run DummyPipeline-02'\n" }],
+        publishers: [{ downstream: { project: 'DummyPipeline-02' } }]
+      }
+      result = compiler.compile(job, settings_bag)
+      expect(result[1]).to eq(job_compiled)
     end
 
     it 'compiles an enabled job with a string parameter' do
@@ -44,7 +106,7 @@ describe JenkinsPipelineBuilder::Compiler do
                        triggers: [{ periodic_build: 'this_is_a_var' }] }
       settings_bag = { var: 'this_is_a_var', name: 'name' }
 
-      result = compiler.compile(my_job, settings_bag, job_collection)
+      result = compiler.compile(my_job, settings_bag)
       expect(result[1]).to eq(compiled_job)
     end
   end
@@ -53,8 +115,7 @@ describe JenkinsPipelineBuilder::Compiler 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)
+      success, item = compiler.handle_enable(item, settings)
       expect(success).to be true
       expect(item).to eq(rootPom: 'path_to_pomasd')
     end
@@ -62,8 +123,7 @@ describe JenkinsPipelineBuilder::Compiler do
     it 'generates correct new jobs when the params are a string' do
       item = { enabled: '{{use1}}', parameters: '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: '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)
+      success, item = compiler.handle_enable(item, settings)
       expect(success).to be true
       expect(item).to eq('path_to_pomasd')
     end
@@ -71,8 +131,7 @@ describe JenkinsPipelineBuilder::Compiler do
     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)
+      success, item = compiler.handle_enable(item, settings)
       expect(success).to be true
       expect(item).to eq({})
     end
@@ -80,16 +139,14 @@ describe JenkinsPipelineBuilder::Compiler do
     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)
+      success, _ = compiler.handle_enable(item, settings)
       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)
+      success, result = compiler.handle_enable(item, settings)
       expect(success).to be true
       expect(result).to eq({})
     end