From 72ca9f759f1f2b27a8e4ea98bfbc939215fcdb3a Mon Sep 17 00:00:00 2001
From: John Cai <jcai@gitlab.com>
Date: Fri, 18 Aug 2023 12:02:38 -0400
Subject: [PATCH] .gitlab-ci.yml: Run rails-specs automatically

Allow rails-specs to automatically run after start-rails-specs instead
of itself also being a manual action.
---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1ca532e7e..030a5e669f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -521,8 +521,9 @@ rails-specs:
     GITALY_TEST: "true"
     FORCE_GITLAB_CI: "true"
   rules:
-    - when: manual
+    - if: '"$CI_MERGE_REQUEST_IID" != ""'
       allow_failure: true
+    - when: manual
 
 rails-specs-cleanup:
   stage: qa
@@ -534,9 +535,6 @@ rails-specs-cleanup:
   environment:
     name: merge-requests/$RAILS_BRANCH_FOR_JOB
     action: stop
-  rules:
-    - when: manual
-      allow_failure: true
 
 cleanup-rails-spec-test-env:
   needs: ["rails-specs-cleanup"]
-- 
GitLab