diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 12:11:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 12:11:43 +0300 |
| commit | c00c766f13d6e0291831a25434eb54057708cc47 (patch) | |
| tree | b1db8dd9d5b109486f107be231dc0edb82457d61 /gems | |
| parent | 99f384810fcb98be5dc45c22552eb80a76021387 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'gems')
| -rw-r--r-- | gems/gem.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | gems/gitlab-rspec/.rubocop.yml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gems/gem.gitlab-ci.yml b/gems/gem.gitlab-ci.yml index 069bd85d0fb..107164d0b78 100644 --- a/gems/gem.gitlab-ci.yml +++ b/gems/gem.gitlab-ci.yml @@ -13,12 +13,14 @@ spec: workflow: name: '$PIPELINE_NAME' rules: - - if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "maintenance"' - variables: - PIPELINE_NAME: '[$[[inputs.gem_name]] gem] Ruby $RUBY_VERSION $SCHEDULE_TYPE $CI_PIPELINE_SOURCE pipeline' - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached"' variables: PIPELINE_NAME: '[$[[inputs.gem_name]] gem] Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' + # CI_PIPELINE_SOURCE will always be "parent_pipeline" since this is a child pipeline + # document this here to avoid confusion and to define the default value for PIPELINE_NAME + - if: '$CI_PIPELINE_SOURCE == "parent_pipeline"' + variables: + PIPELINE_NAME: '[$[[inputs.gem_name]] gem] Ruby $RUBY_VERSION default pipeline' variables: BUNDLE_PATH: "vendor" diff --git a/gems/gitlab-rspec/.rubocop.yml b/gems/gitlab-rspec/.rubocop.yml index 38c0c592dad..542b2b8e122 100644 --- a/gems/gitlab-rspec/.rubocop.yml +++ b/gems/gitlab-rspec/.rubocop.yml @@ -8,3 +8,7 @@ RSpec/InstanceVariable: Gitlab/ChangeTimezone: Exclude: - spec/gitlab/rspec/time_travel_spec.rb + +RSpec/BeforeAll: + Exclude: + - spec/gitlab/rspec/time_travel_spec.rb |