diff --git a/app/controllers/api/v1/projects/pipelines_controller.rb b/app/controllers/api/v1/projects/pipelines_controller.rb index 493fb6e84..e080fdcdc 100644 --- a/app/controllers/api/v1/projects/pipelines_controller.rb +++ b/app/controllers/api/v1/projects/pipelines_controller.rb @@ -115,6 +115,7 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController job_nodes = pipeline_json["nodes"].select { |node| node["data"]["name"].to_s.include?("job") } on_nodes = pipeline_json["nodes"].select { |node| ["on-push", "on-schedule", "on-pull_request", "on-fork"].include?(node["data"]["name"]) } @on_nodes = build_nodes(on_nodes) + Rails.logger.info "111=========================#{@on_nodes}" @job_nodes = [] job_nodes.each do |job| node = Action::Node.find_by(name: job["data"]["name"]) @@ -127,6 +128,7 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController get_all_child_nodes(node, next_step_node) if next_step_node.present? @job_nodes.push(node) end + Rails.logger.info "222=========================#{@job_nodes}" yaml = ERB.new(File.read(File.join(Rails.root, "app/views/api/v1/projects/pipelines", "build_pipeline.yaml.erb"))).result(binding) pipeline_yaml = yaml.gsub(/^\s*\n/, "") Rails.logger.info "=========================" @@ -172,10 +174,10 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController input_values = {} if input_node["inputs"].present? input_node["inputs"].each do |input| - if input[:name].to_s.gsub("--", "") == "run" - run_values = run_values.merge({ "#{input[:name].gsub("--", "")}": "#{input["value"]}" }) + if input["name"].to_s.gsub("--", "") == "run" + run_values = run_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" }) else - input_values = input_values.merge({ "#{input[:name].gsub("--", "")}": "#{input["value"]}" }) + input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" }) end end node.run_values = run_values