Commit a1620ff4 authored by John Skarbek's avatar John Skarbek Committed by John Jarvis

Removes the requirement to spin up the auto-deploy branch in deployer

* This is no longer required as this branch wasn't going to be usable
due to existing process limitations
parent 38ffe709
......@@ -71,7 +71,6 @@ require 'release_tools/pipeline'
require 'release_tools/preparation_merge_request'
require 'release_tools/project/base_project'
require 'release_tools/project/cng_image'
require 'release_tools/project/deployer'
require 'release_tools/project/gitlab_ce'
require 'release_tools/project/gitlab_ee'
require 'release_tools/project/gitlab_provisioner'
......
# frozen_string_literal: true
module ReleaseTools
module Project
class Deployer < BaseProject
REMOTES = {
ops: 'git@ops.gitlab.net:gitlab-com/gl-infra/deployer.git'
}.freeze
DEFAULT_REMOTE = :ops
end
end
end
......@@ -15,13 +15,10 @@ module ReleaseTools
def create_branches!
# Find passing commits before creating branches
ref_deployer = latest_successful_ref(Project::Deployer, gitlab_ops_client)
ref_ce = latest_successful_ref(Project::GitlabCe)
ref_ee = latest_successful_ref(Project::GitlabEe)
ref_omnibus = latest_successful_ref(Project::OmnibusGitlab)
# Deployer uses ops.gitlab.net as the source for all branches
create_branch_from_ref(Project::Deployer, branch_name, ref_deployer, gitlab_ops_client)
create_branch_from_ref(Project::GitlabCe, branch_name, ref_ce)
create_branch_from_ref(Project::GitlabEe, branch_name, ref_ee)
create_branch_from_ref(Project::OmnibusGitlab, branch_name, ref_omnibus)
......
......@@ -18,25 +18,20 @@ describe ReleaseTools::Services::AutoDeployBranchService do
it 'creates auto-deploy branches for gitlab-ee and gitlab-ce' do
branch_name = 'branch-name'
expect(ReleaseTools::Commits).to receive(:new).and_return(branch_commit).exactly(4).times
expect(internal_client_ops).to receive(:create_branch).with(
branch_name,
'1234',
ReleaseTools::Project::Deployer
)
expect(service).to receive(:latest_successful_ref).and_return(branch_commit).exactly(3).times
expect(internal_client).to receive(:create_branch).with(
branch_name,
'1234',
branch_commit,
ReleaseTools::Project::GitlabCe
)
expect(internal_client).to receive(:create_branch).with(
branch_name,
'1234',
branch_commit,
ReleaseTools::Project::GitlabEe
)
expect(internal_client).to receive(:create_branch).with(
branch_name,
'1234',
branch_commit,
ReleaseTools::Project::OmnibusGitlab
)
expect(internal_client).to receive(:update_variable).with(
......
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