Project

General

Profile

Revision d667d1b9

Added by Ondřej Pražák about 8 years ago

b-e modifications

View differences:

app/controllers/foreman_pipeline/api/jenkins_users_controller.rb
58 58
    end
59 59

  
60 60
    def jenkins_user_params
61
      params.require(:jenkins_user).permit(:name, :token, :job_id)
61
      params.require(:jenkins_user).permit(:name, :token)
62 62
    end
63 63
    
64 64
  end
app/controllers/foreman_pipeline/api/jobs_controller.rb
63 63

  
64 64
    def set_jenkins
65 65
      instance = JenkinsInstance.find(params[:jenkins_instance_id])
66
      @job.jenkins_user = nil unless instance == @job.jenkins_instance
67 66
      @job.jenkins_instance = instance
68 67
      @job.save!
69 68
      respond_for_show
app/lib/actions/foreman_pipeline/jenkins/build_project.rb
6 6
        def plan(options)
7 7
          sequence do
8 8
            build_task = plan_action(Build, options)
9
            wait_task = plan_action(WaitForBuild, :job_id => options[:job_id], :name => options[:project_name], :build_num => build_task.output[:build_num])
9
            wait_task = plan_action(WaitForBuild, :job_id => options[:job_id],
10
                                                  :name => options[:project_name],
11
                                                  :build_num => build_task.output[:build_num])
10 12
            
11 13
            plan_self(:build_status => wait_task.output[:details][:result], :name => options[:project_name])
12 14
          end
app/lib/actions/foreman_pipeline/job/deploy_new_host.rb
28 28

  
29 29
            packages = plan_action(FindPackagesToInstall, :job_id => job.id)
30 30

  
31

  
32 31
            bulk_build = plan_action(Jenkins::BulkBuild, 
33 32
                                      job.jenkins_projects,
34 33
                                      :job_id => job.id,
35 34
                                      :data => h,#redeploy.output,
36 35
                                      :packages => packages.output[:package_names])
37
            plan_action(Promote, :job_id => job.id, :build_fails => bulk_build.output[:failed_count])            
36
            # plan_action(Promote, :job_id => job.id, :build_fails => bulk_build.output[:failed_count])            
38 37
          end
39 38
        end
40 39
      end
app/models/foreman_pipeline/job.rb
41 41

  
42 42
    def init_run
43 43
      fail "Cannnot contact Jenkins server: no Jenkins Instance set for the job: #{name}" if jenkins_instance.nil?
44
      fail "Cannot log in to Jenkins server: no Jenkins User set for the job: #{name}" if jenkins_user.nil? 
45
      jenkins_instance.create_client(jenkins_user.name, jenkins_user.token)
44
      fail "Cannot log in to Jenkins server:
45
            no Jenkins User set for the Jenkins Instance: #{jenkins_instancej.name}" if jenkins_instance.jenkins_user.nil? 
46
      jenkins_instance.create_client(jenkins_instance.jenkins_user.name, jenkins_instance.jenkins_user.token)
46 47
    end
47 48

  
48 49
    def version_already_promoted?

Also available in: Unified diff