From bfacf1e7c96058cd738ac84fed9f3f8b6bdb9db6 Mon Sep 17 00:00:00 2001
From: John Cai <jcai@gitlab.com>
Date: Tue, 16 Jan 2024 16:18:57 -0500
Subject: .gitlab-ci.yml: start rails spec and cleanup automatically

---
 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef608ef89..b01e79583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -504,7 +504,8 @@ start-rails-specs:
     name: merge-requests/$RAILS_BRANCH_FOR_JOB
     on_stop: rails-specs-cleanup
   rules:
-    - when: manual
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
+      when: manual
       allow_failure: true
 
 rails-specs:
@@ -523,7 +524,7 @@ rails-specs:
     ENABLE_RSPEC_INTEGRATION: "true"
     ENABLE_RSPEC_SYSTEM: "true"
   rules:
-    - when: manual
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
       allow_failure: true
 
 rails-specs-cleanup:
@@ -537,7 +538,8 @@ rails-specs-cleanup:
     name: merge-requests/$RAILS_BRANCH_FOR_JOB
     action: stop
   rules:
-    - when: manual
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
+      when: manual
       allow_failure: true
 
 cleanup-rails-spec-test-env:
@@ -551,7 +553,7 @@ cleanup-rails-spec-test-env:
        ENV_ID=$(curl -s --request GET --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments" --data-urlencode "name=merge-requests/$RAILS_BRANCH_FOR_JOB" | jq '.[0].id')
        curl --fail -s --request DELETE --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments/$ENV_ID"
   rules:
-    - when: manual
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
       allow_failure: true
 
 build-package-and-qa:
-- 
cgit v1.2.3


From 4c5cb757164455b1278fa21456976697b70b44ba Mon Sep 17 00:00:00 2001
From: John Cai <jcai@gitlab.com>
Date: Thu, 18 Jan 2024 08:35:08 -0500
Subject: for testing

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b01e79583..da99ebb97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,7 @@ workflow:
     - if: $CI_MERGE_REQUEST_IID
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == "jc/automate-rails-pipeline"
     - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/'
     - if: $FORCE_GITALY_CI
 
@@ -525,7 +526,6 @@ rails-specs:
     ENABLE_RSPEC_SYSTEM: "true"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
-      allow_failure: true
 
 rails-specs-cleanup:
   stage: qa
@@ -540,7 +540,6 @@ rails-specs-cleanup:
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
       when: manual
-      allow_failure: true
 
 cleanup-rails-spec-test-env:
   needs: ["rails-specs-cleanup"]
@@ -554,7 +553,6 @@ cleanup-rails-spec-test-env:
        curl --fail -s --request DELETE --header "PRIVATE-TOKEN: $GITALY_PROJECT_TOKEN" "https://gitlab.com/api/v4/projects/2009901/environments/$ENV_ID"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train"
-      allow_failure: true
 
 build-package-and-qa:
   needs: []
-- 
cgit v1.2.3