fixed 图形化流水线增加分支流程-启动节点
This commit is contained in:
parent
3ba6259d9f
commit
6a0bec2d3a
|
@ -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") }
|
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 = pipeline_json["nodes"].select { |node| ["on-push", "on-schedule", "on-pull_request", "on-fork"].include?(node["data"]["name"]) }
|
||||||
@on_nodes = build_nodes(on_nodes)
|
@on_nodes = build_nodes(on_nodes)
|
||||||
|
Rails.logger.info "111=========================#{@on_nodes}"
|
||||||
@job_nodes = []
|
@job_nodes = []
|
||||||
job_nodes.each do |job|
|
job_nodes.each do |job|
|
||||||
node = Action::Node.find_by(name: job["data"]["name"])
|
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?
|
get_all_child_nodes(node, next_step_node) if next_step_node.present?
|
||||||
@job_nodes.push(node)
|
@job_nodes.push(node)
|
||||||
end
|
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)
|
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/, "")
|
pipeline_yaml = yaml.gsub(/^\s*\n/, "")
|
||||||
Rails.logger.info "========================="
|
Rails.logger.info "========================="
|
||||||
|
@ -172,10 +174,10 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
|
||||||
input_values = {}
|
input_values = {}
|
||||||
if input_node["inputs"].present?
|
if input_node["inputs"].present?
|
||||||
input_node["inputs"].each do |input|
|
input_node["inputs"].each do |input|
|
||||||
if input[:name].to_s.gsub("--", "") == "run"
|
if input["name"].to_s.gsub("--", "") == "run"
|
||||||
run_values = run_values.merge({ "#{input[:name].gsub("--", "")}": "#{input["value"]}" })
|
run_values = run_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
|
||||||
else
|
else
|
||||||
input_values = input_values.merge({ "#{input[:name].gsub("--", "")}": "#{input["value"]}" })
|
input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
node.run_values = run_values
|
node.run_values = run_values
|
||||||
|
|
Loading…
Reference in New Issue