diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-07 18:45:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-07 18:45:03 +0000 |
| commit | bc955cfc8e75e17897ab25717176209fefbba915 (patch) | |
| tree | 8869352347bdbf2542e7a725f84bb2d780607500 | |
| parent | 354a12c3d1afcad7e36f06eafb03f795aa5d6a29 (diff) | |
| parent | a501feb4fb9bee2317c2bdfe627ff8c5242771a4 (diff) | |
| download | gitlab-ce-bc955cfc8e75e17897ab25717176209fefbba915.tar.gz | |
Merge branch 'rs-trigger-build-docs-offenses' into 'master'
Resolve RuboCop violations in scripts/trigger-build-docs
See merge request !14118
| -rwxr-xr-x | scripts/trigger-build-docs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs index e58edf189cf..44f832ed3e6 100755 --- a/scripts/trigger-build-docs +++ b/scripts/trigger-build-docs @@ -7,7 +7,7 @@ require 'gitlab' # in order to avoid conflicts # @docs_branch = "#{ENV["CI_COMMIT_REF_SLUG"]}-built-from-ce-ee" -GITLAB_DOCS_REPO = 'gitlab-com/gitlab-docs' +GITLAB_DOCS_REPO = 'gitlab-com/gitlab-docs'.freeze # # Configure credentials to be used with gitlab gem @@ -20,8 +20,8 @@ end # # Dummy way to find out in which repo we are, CE or EE # -def is_ee? - File.exists?('CHANGELOG-EE.md') +def ee? + File.exist?('CHANGELOG-EE.md') end # @@ -30,7 +30,7 @@ end def create_remote_branch Gitlab.create_branch(GITLAB_DOCS_REPO, @docs_branch, 'master') puts "Remote branch '#{@docs_branch}' created" -rescue Gitlab::Error::BadRequest => e +rescue Gitlab::Error::BadRequest puts "Remote branch '#{@docs_branch}' already exists" end @@ -47,10 +47,10 @@ end # def trigger_pipeline # Overriding vars in https://gitlab.com/gitlab-com/gitlab-docs/blob/master/.gitlab-ci.yml - param_name = is_ee? ? 'BRANCH_EE' : 'BRANCH_CE' + param_name = ee? ? 'BRANCH_EE' : 'BRANCH_CE' # The review app URL - app_url = "http://#{@docs_branch}.#{ENV["DOCS_REVIEW_APPS_DOMAIN"]}/#{is_ee? ? 'ee' : 'ce'}" + app_url = "http://#{@docs_branch}.#{ENV["DOCS_REVIEW_APPS_DOMAIN"]}/#{ee? ? 'ee' : 'ce'}" # Create the pipeline puts "=> Triggering a pipeline..." |