From 37d1d48266df7fa81d8b897b576203e671cfb56c Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <jen-shin@gitlab.com>
Date: Tue, 16 Jan 2024 16:49:51 +0800
Subject: Do not pass Gitaly variables to Rails pipeline

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e321f29ca..ef608ef89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -514,9 +514,14 @@ rails-specs:
     project: gitlab-org/gitlab
     branch: "gitaly-ci-jobs-$CI_PIPELINE_IID" # Using $RAILS_BRANCH_FOR_JOB directly fails
     strategy: depend
+  inherit:
+    variables: false  # Otherwise variables will be messed up
   variables:
     GITALY_TEST: "true"
-    FORCE_GITLAB_CI: "true"
+    ENABLE_RSPEC: "true"
+    ENABLE_RSPEC_UNIT: "true"
+    ENABLE_RSPEC_INTEGRATION: "true"
+    ENABLE_RSPEC_SYSTEM: "true"
   rules:
     - when: manual
       allow_failure: true
-- 
cgit v1.2.3