diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 165bac8b83d66a7acfebd0e51befbf37e7b73e4d..70f3620aa791b2d25345171db257844c76932eed 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -126,3 +126,4 @@ only: variables: - $CI_PROJECT_NAME == "gitlab" + - $CI_PROJECT_NAME == "gitlab-ee" # Support former project name for forks/mirrors diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 129913a9f2d98d04bb82c517505eb2c7c5b59d13..861f3f1af5b4ed5880db17a405b26f46585a693f 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -43,5 +43,6 @@ no_ee_check: - scripts/no-ee-check only: variables: - - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-foss" - - $CI_SERVER_HOST == "dev.gitlab.org" && $CI_PROJECT_NAME == "gitlabhq" + - $CI_PROJECT_NAME == "gitlab-foss" + - $CI_PROJECT_NAME == "gitlab-ce" # Support former project name for forks/mirrors + - $CI_PROJECT_NAME == "gitlabhq" # Support former project name for dev diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb index 36e0ec65720066b55cefac0d16c1646015e349be..f22fc41a6d84273719a2e5feda18807079274cfc 100644 --- a/lib/gitlab/danger/helper.rb +++ b/lib/gitlab/danger/helper.rb @@ -35,7 +35,8 @@ def all_changed_files end def ee? - ENV['CI_PROJECT_NAME'] == 'gitlab' || File.exist?('../../CHANGELOG-EE.md') + # Support former project name for `dev` and support local Danger run + %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) || Dir.exist?('../../ee') end def gitlab_helper diff --git a/scripts/review_apps/automated_cleanup.rb b/scripts/review_apps/automated_cleanup.rb index 4166070f7cd87b584f5ba8369bcb7bfafd66cd78..9edc1a2b85722d3d6a4b71e952e7dbe73283df96 100755 --- a/scripts/review_apps/automated_cleanup.rb +++ b/scripts/review_apps/automated_cleanup.rb @@ -18,7 +18,8 @@ class AutomatedCleanup ].freeze def self.ee? - ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') + # Support former project name for `dev` + %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) end def initialize(project_path: ENV['CI_PROJECT_PATH'], gitlab_token: ENV['GITLAB_BOT_REVIEW_APPS_CLEANUP_TOKEN']) diff --git a/scripts/trigger-build b/scripts/trigger-build index 4d8110fce104e757a0db81d2fb4a6bcb3ec7fa9c..fe036dae99effc0dac683383e4f03148bbeca4d3 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -12,7 +12,8 @@ end module Trigger def self.ee? - ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') + # Support former project name for `dev` + %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) end class Base diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb index efa878ad43d15b7cddd624a056c3ea1f7d99ac37..1696d3566adf8914e293b3be4503f65ae949e042 100644 --- a/spec/lib/gitlab/danger/helper_spec.rb +++ b/spec/lib/gitlab/danger/helper_spec.rb @@ -88,28 +88,28 @@ def initialize(git:, gitlab:) it 'returns true if CI_PROJECT_NAME if set to gitlab' do stub_env('CI_PROJECT_NAME', 'gitlab') - expect(File).not_to receive(:exist?) + expect(Dir).not_to receive(:exist?) is_expected.to be_truthy end it 'delegates to CHANGELOG-EE.md existence if CI_PROJECT_NAME is set to something else' do stub_env('CI_PROJECT_NAME', 'something else') - expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { true } + expect(Dir).to receive(:exist?).with('../../ee') { true } is_expected.to be_truthy end - it 'returns true if CHANGELOG-EE.md exists' do + it 'returns true if ee exists' do stub_env('CI_PROJECT_NAME', nil) - expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { true } + expect(Dir).to receive(:exist?).with('../../ee') { true } is_expected.to be_truthy end - it "returns false if CHANGELOG-EE.md doesn't exist" do + it "returns false if ee doesn't exist" do stub_env('CI_PROJECT_NAME', nil) - expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { false } + expect(Dir).to receive(:exist?).with('../../ee') { false } is_expected.to be_falsy end