GitLab steht Mittwoch, den 23. September, zwischen 10:00 und 12:00 Uhr aufgrund von Wartungsarbeiten nicht zur Verfügung.

Commit 45d8c213 authored by Rémy Coutable's avatar Rémy Coutable

Refactor scripts/trigger-build and post a commit note with the downstream...

Refactor scripts/trigger-build and post a commit note with the downstream pipeline URL for omnibus triggers
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent bd30b0d5
...@@ -130,7 +130,6 @@ stages: ...@@ -130,7 +130,6 @@ stages:
.single-script-job: &single-script-job .single-script-job: &single-script-job
image: ruby:2.4-alpine image: ruby:2.4-alpine
before_script: []
stage: test stage: test
cache: {} cache: {}
dependencies: [] dependencies: []
...@@ -259,6 +258,7 @@ package-and-qa: ...@@ -259,6 +258,7 @@ package-and-qa:
SCRIPT_NAME: trigger-build SCRIPT_NAME: trigger-build
retry: 0 retry: 0
script: script:
- gem install gitlab --no-document
- ./$SCRIPT_NAME omnibus - ./$SCRIPT_NAME omnibus
when: manual when: manual
only: only:
...@@ -285,7 +285,7 @@ review-docs-deploy-manual: ...@@ -285,7 +285,7 @@ review-docs-deploy-manual:
<<: *review-docs <<: *review-docs
stage: build stage: build
script: script:
- gem install gitlab --no-ri --no-rdoc - gem install gitlab --no-document
- ./$SCRIPT_NAME deploy - ./$SCRIPT_NAME deploy
when: manual when: manual
only: only:
...@@ -299,7 +299,7 @@ review-docs-deploy: ...@@ -299,7 +299,7 @@ review-docs-deploy:
<<: *review-docs <<: *review-docs
stage: post-test stage: post-test
script: script:
- gem install gitlab --no-ri --no-rdoc - gem install gitlab --no-document
- ./$SCRIPT_NAME deploy - ./$SCRIPT_NAME deploy
only: only:
- /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ce - /(^docs[\/-].*|.*-docs$)/@gitlab-org/gitlab-ce
...@@ -314,7 +314,7 @@ review-docs-cleanup: ...@@ -314,7 +314,7 @@ review-docs-cleanup:
name: review-docs/$CI_COMMIT_REF_SLUG name: review-docs/$CI_COMMIT_REF_SLUG
action: stop action: stop
script: script:
- gem install gitlab --no-ri --no-rdoc - gem install gitlab --no-document
- ./$SCRIPT_NAME cleanup - ./$SCRIPT_NAME cleanup
when: manual when: manual
only: only:
...@@ -333,8 +333,8 @@ cloud-native-image: ...@@ -333,8 +333,8 @@ cloud-native-image:
GIT_DEPTH: "1" GIT_DEPTH: "1"
cache: {} cache: {}
script: script:
- gem install gitlab --no-ri --no-rdoc - gem install gitlab --no-document
- BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN scripts/trigger-build cng - CNG_PROJECT_PATH="gitlab-org/build/CNG" BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN ./scripts/trigger-build cng
only: only:
- tags@gitlab-org/gitlab-ce - tags@gitlab-org/gitlab-ce
- tags@gitlab-org/gitlab-ee - tags@gitlab-org/gitlab-ee
...@@ -366,7 +366,7 @@ update-tests-metadata: ...@@ -366,7 +366,7 @@ update-tests-metadata:
- rspec_flaky/ - rspec_flaky/
policy: push policy: push
script: script:
- retry gem install fog-aws mime-types activesupport --no-ri --no-rdoc - retry gem install fog-aws mime-types activesupport --no-document
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
- scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json - scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json
- FLAKY_RSPEC_GENERATE_REPORT=1 scripts/prune-old-flaky-specs ${FLAKY_RSPEC_SUITE_REPORT_PATH} - FLAKY_RSPEC_GENERATE_REPORT=1 scripts/prune-old-flaky-specs ${FLAKY_RSPEC_SUITE_REPORT_PATH}
......
#!/usr/bin/env ruby #!/usr/bin/env ruby
require 'net/http' require 'gitlab'
require 'json'
require 'cgi' #
# Configure credentials to be used with gitlab gem
#
Gitlab.configure do |config|
config.endpoint = 'https://gitlab.com/api/v4'
config.private_token = ENV['GITLAB_QA_ACCESS_TOKEN'] # gitlab-qa bot access token
end
module Trigger module Trigger
OMNIBUS_PROJECT_PATH = 'gitlab-org/omnibus-gitlab'.freeze
CNG_PROJECT_PATH = 'gitlab-org/build/CNG'.freeze
TOKEN = ENV['BUILD_TRIGGER_TOKEN'] TOKEN = ENV['BUILD_TRIGGER_TOKEN']
def self.ee? def self.ee?
ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md')
end end
class Omnibus class Base
def initialize def initialize(api_token)
@uri = URI("https://gitlab.com/api/v4/projects/#{CGI.escape(Trigger::OMNIBUS_PROJECT_PATH)}/trigger/pipeline") Gitlab.private_token = api_token
@params = env_params.merge(file_params).merge(token: Trigger::TOKEN)
end end
def invoke! def invoke!(post_comment: false)
res = Net::HTTP.post_form(@uri, @params) pipeline = Gitlab.run_trigger(
id = JSON.parse(res.body)['id'] downstream_project_path,
project = Trigger::OMNIBUS_PROJECT_PATH Trigger::TOKEN,
ref,
variables)
if id puts "Triggered #{pipeline.web_url}"
puts "Triggered https://gitlab.com/#{project}/pipelines/#{id}" puts "Waiting for downstream pipeline status"
puts "Waiting for downstream pipeline status"
else
raise "Trigger failed! The response from the trigger is: #{res.body}"
end
Trigger::Pipeline.new(project, id) begin
Trigger::CommitComment.post!(downstream_project_path, pipeline) if post_comment
rescue Gitlab::Error::Error => error
puts "Ignoring the following error: #{error}"
end
Trigger::Pipeline.new(downstream_project_path, pipeline.id)
end end
private private
def env_params # Must be overriden
def downstream_project_path
raise NotImplementedError
end
# Must be overriden
def ref
raise NotImplementedError
end
# Can be overriden
def extra_variables
{}
end
# Can be overriden
def version_param_value(version_file)
File.read(version_file).strip
end
def variables
base_variables.merge(extra_variables).merge(version_file_variables)
end
def base_variables
{ {
"ref" => ENV["OMNIBUS_BRANCH"] || "master", 'TRIGGERED_USER' => ENV['GITLAB_USER_NAME'],
"variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL']
"variables[ALTERNATIVE_SOURCES]" => true,
"variables[ee]" => Trigger.ee? ? 'true' : 'false',
"variables[TRIGGERED_USER]" => ENV["GITLAB_USER_NAME"],
"variables[TRIGGER_SOURCE]" => "https://gitlab.com/gitlab-org/#{ENV['CI_PROJECT_NAME']}/-/jobs/#{ENV['CI_JOB_ID']}"
} }
end end
def file_params # Read version files from all components
Hash.new.tap do |params| def version_file_variables
Dir.glob("*_VERSION").each do |version_file| Dir.glob("*_VERSION").each_with_object({}) do |version_file, params|
params["variables[#{version_file}]"] = File.read(version_file).strip params[version_file] = version_param_value(version_file)
end
end end
end end
end end
class CNG class Omnibus < Base
def initialize private
@uri = URI("https://gitlab.com/api/v4/projects/#{CGI.escape(Trigger::CNG_PROJECT_PATH)}/trigger/pipeline")
@ref_name = ENV['CI_COMMIT_REF_NAME']
@username = ENV['GITLAB_USER_NAME']
@project_name = ENV['CI_PROJECT_NAME']
@job_id = ENV['CI_JOB_ID']
@params = env_params.merge(file_params).merge(token: Trigger::TOKEN)
end
#
# Trigger a pipeline
#
def invoke!
res = Net::HTTP.post_form(@uri, @params)
id = JSON.parse(res.body)['id']
project = Trigger::CNG_PROJECT_PATH
if id
puts "Triggered https://gitlab.com/#{project}/pipelines/#{id}"
puts "Waiting for downstream pipeline status"
else
raise "Trigger failed! The response from the trigger is: #{res.body}"
end
Trigger::Pipeline.new(project, id) def downstream_project_path
'gitlab-org/omnibus-gitlab'.freeze
end end
def ref
ENV['OMNIBUS_BRANCH'] || 'master'
end
def extra_variables
{
'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
'ALTERNATIVE_SOURCES' => 'true',
'ee' => Trigger.ee? ? 'true' : 'false'
}
end
end
class CNG < Base
private private
def env_params def downstream_project_path
params = { ENV['CNG_PROJECT_PATH'] || 'gitlab-org/build/CNG-mirror'
"ref" => ENV["CNG_BRANCH"] || "master", end
"variables[TRIGGERED_USER]" => @username,
"variables[TRIGGER_SOURCE]" => "https://gitlab.com/gitlab-org/#{@project_name}/-/jobs/#{@job_id}" def ref
ENV['CNG_BRANCH'] || 'master'
end
def extra_variables
edition = Trigger.ee? ? 'EE' : 'CE'
{
"GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'],
"#{edition}_PIPELINE" => 'true'
} }
end
if Trigger.ee? def version_param_value(_version_file)
params["variables[GITLAB_EE_VERSION]"] = @ref_name raw_version = super
params["variables[EE_PIPELINE]"] = 'true'
# if the version matches semver format, treat it as a tag and prepend `v`
if raw_version =~ Regexp.compile(/^\d+\.\d+\.\d+(-rc\d+)?(-ee)?$/)
"v#{raw_version}"
else else
params["variables[GITLAB_CE_VERSION]"] = @ref_name raw_version
params["variables[CE_PIPELINE]"] = 'true'
end end
params
end end
end
# Read version files from all components class CommitComment
def file_params def self.post!(downstream_project_path, downstream_pipeline)
Dir.glob("*_VERSION").each_with_object({}) do |version_file, params| Gitlab.create_commit_comment(
raw_version = File.read(version_file).strip ENV['CI_PROJECT_PATH'],
# if the version matches semver format, treat it as a tag and prepend `v` ENV['CI_COMMIT_SHA'],
version = if raw_version =~ Regexp.compile(/^\d+\.\d+\.\d+(-rc\d+)?(-ee)?$/) "The [`#{ENV['CI_JOB_NAME']}`](#{ENV['CI_JOB_URL']}) job from pipeline #{ENV['CI_PIPELINE_URL']} triggered #{downstream_pipeline.web_url} downstream.")
"v#{raw_version}"
else
raw_version
end
params["variables[#{version_file}]"] = version
end
end end
end end
...@@ -124,9 +146,15 @@ module Trigger ...@@ -124,9 +146,15 @@ module Trigger
INTERVAL = 60 # seconds INTERVAL = 60 # seconds
MAX_DURATION = 3600 * 3 # 3 hours MAX_DURATION = 3600 * 3 # 3 hours
attr_reader :project, :id
def initialize(project, id) def initialize(project, id)
@project = project
@id = id
@start = Time.now.to_i @start = Time.now.to_i
@uri = URI("https://gitlab.com/api/v4/projects/#{CGI.escape(project)}/pipelines/#{id}")
# gitlab-bot's token "GitLab multi-project pipeline polling"
Gitlab.private_token = ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
end end
def wait! def wait!
...@@ -157,15 +185,9 @@ module Trigger ...@@ -157,15 +185,9 @@ module Trigger
end end
def status def status
req = Net::HTTP::Get.new(@uri) Gitlab.pipeline(project, id).status.to_sym
req['PRIVATE-TOKEN'] = ENV['GITLAB_QA_ACCESS_TOKEN'] rescue Gitlab::Error::Error => error
puts "Ignoring the following error: #{error}"
res = Net::HTTP.start(@uri.hostname, @uri.port, use_ssl: true) do |http|
http.request(req)
end
JSON.parse(res.body)['status'].to_s.to_sym
rescue JSON::ParserError
# Ignore GitLab API hiccups. If GitLab is really down, we'll hit the job # Ignore GitLab API hiccups. If GitLab is really down, we'll hit the job
# timeout anyway. # timeout anyway.
:running :running
...@@ -175,9 +197,9 @@ end ...@@ -175,9 +197,9 @@ end
case ARGV[0] case ARGV[0]
when 'omnibus' when 'omnibus'
Trigger::Omnibus.new.invoke!.wait! Trigger::Omnibus.new(ENV['GITLAB_QA_ACCESS_TOKEN']).invoke!(post_comment: true).wait!
when 'cng' when 'cng'
Trigger::CNG.new.invoke!.wait! Trigger::CNG.new(ENV['GITLAB_QA_ACCESS_TOKEN']).invoke!.wait!
else else
puts "Please provide a valid option: puts "Please provide a valid option:
omnibus - Triggers a pipeline that builds the omnibus-gitlab package omnibus - Triggers a pipeline that builds the omnibus-gitlab package
......
...@@ -6,8 +6,8 @@ require 'gitlab' ...@@ -6,8 +6,8 @@ require 'gitlab'
# Configure credentials to be used with gitlab gem # Configure credentials to be used with gitlab gem
# #
Gitlab.configure do |config| Gitlab.configure do |config|
config.endpoint = 'https://gitlab.com/api/v4' config.endpoint = 'https://gitlab.com/api/v4'
config.private_token = ENV["DOCS_API_TOKEN"] # GitLab Docs bot access token with Developer access to gitlab-docs config.private_token = ENV["DOCS_API_TOKEN"] # GitLab Docs bot access token with Developer access to gitlab-docs
end end
# #
...@@ -99,7 +99,7 @@ def trigger_pipeline ...@@ -99,7 +99,7 @@ def trigger_pipeline
puts "=> Follow the status of the triggered pipeline:" puts "=> Follow the status of the triggered pipeline:"
puts "" puts ""
puts "https://gitlab.com/gitlab-com/gitlab-docs/pipelines/#{pipeline.id}" puts pipeline.web_url
puts "" puts ""
puts "=> In a few minutes, you will be able to preview your changes under the following URL:" puts "=> In a few minutes, you will be able to preview your changes under the following URL:"
puts "" puts ""
......
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