lets use a trigger for merge train instead

parent 4feb9d3f
......@@ -50,16 +50,12 @@ namespace :auto_deploy do
raise "Nothing was picked, bailing..." if successful_picks == 0
conflicts = ReleaseTools::UpstreamMerge.new(
origin: ReleaseTools::Project::GitlabEe.remotes[:gitlab],
upstream: ReleaseTools::Project::GitlabCe.remotes[:gitlab],
source_branch: auto_deploy_branch,
target_branch: auto_deploy_branch
).execute!
unless conflicts.nil?
raise "Conflicts in CE to EE merge."
end
ReleaseTools::GitlabOpsClient.run_trigger(
ReleaseTools::Project::MergeTrain,
ENV.fetch['MERGE_TRAIN_TRIGGER_TOKEN'],
master,
{}
)
end
end
......
# frozen_string_literal: true
module ReleaseTools
module Project
class MergeTrain < BaseProject
REMOTES = {
gitlab: 'git@ops.gitlab.net:gitlab-org/merge-train.git'
}.freeze
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment