From c00c766f13d6e0291831a25434eb54057708cc47 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 28 Jul 2023 09:11:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 gems/gem.gitlab-ci.yml         | 8 +++++---
 gems/gitlab-rspec/.rubocop.yml | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'gems')

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
-- 
cgit v1.2.3