Commit 29399fa4 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'jts/adjust-passing-builds-a-tad' into 'master'

Removes the omnibus from building after gitlab

See merge request !596
parents 67ab3ff8 665f415d
......@@ -29,7 +29,7 @@ module ReleaseTools
end
def trigger_build(commit, versions)
pipeline_id = ENV.fetch('CI_PIPELINE_IID', 'pipeline_id_unset')
pipeline_id = ENV.fetch('CI_PIPELINE_ID', 'pipeline_id_unset')
branch_name = "nightly-#{pipeline_id}"
$stdout.puts "Creating branch #{branch_name}"
......
......@@ -8,21 +8,26 @@ namespace :passing_build do
ReleaseTools::PassingBuild.new(project, ref)
end
desc "Find and optionally trigger a green master build for EE"
desc "Find and optionally trigger a passing build for EE"
task :ee, [:ref, :trigger_build] do |_t, args|
ref = args.fetch(:ref, 'master').dup
# HACK: Allow `X-Y-stable` as an argument for both tasks, except master
ref << '-ee' unless ref == 'master'
passing_build(ReleaseTools::Project::GitlabEe, ref).execute(args)
passing_build(ReleaseTools::Project::OmnibusGitlab, ref).execute(args)
end
desc "Find and optionally trigger a green master build for CE"
desc "Find and optionally trigger a passing build for CE"
task :ce, [:ref, :trigger_build] do |_t, args|
ref = args.fetch(:ref, 'master').dup
passing_build(ReleaseTools::Project::GitlabCe, ref).execute(args)
end
desc "Find and optionally trigger a passing build for Omnibus"
task :omnibus, [:ref, :trigger_build] do |_t, args|
ref = args.fetch(:ref, 'master').dup
passing_build(ReleaseTools::Project::OmnibusGitlab, ref).execute(args)
end
......
......@@ -62,7 +62,7 @@ describe ReleaseTools::PassingBuild do
end
it 'creates a temporary branch' do
ClimateControl.modify(CI_PIPELINE_IID: 'fake_pipeline_id') do
ClimateControl.modify(CI_PIPELINE_ID: 'fake_pipeline_id') do
service.trigger_build(fake_commit, spy)
end
......@@ -81,7 +81,7 @@ describe ReleaseTools::PassingBuild do
end
it 'deletes the temporary branch' do
ClimateControl.modify(CI_PIPELINE_IID: 'fake_pipeline_id') do
ClimateControl.modify(CI_PIPELINE_ID: 'fake_pipeline_id') do
service.trigger_build(fake_commit, spy)
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