Merge branch 'jc/allow-retry-ci' into 'master'

.gitlab-ci.yml: Allow retry of jobs

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6135

Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Reviewed-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: John Cai <jcai@gitlab.com>

1 files changed, 0 insertions, 27 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7cd2d9a4..7c76c4243 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,11 +138,6 @@ workflow:
     when: always
     expire_in: 1 week
 
-.rules_run_always: &rules_run_always
-    - if: $CI_MERGE_REQUEST_IID
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/'
-
 .rules_run_on_merge: &rules_run_on_merge
     # We only execute these rules in the main Gitaly repository. This is
     # because jobs which run conditionally when being merged may depend on
@@ -188,8 +183,6 @@ build:
       - GO_VERSION: [ "1.20" ]
         TEST_BOOT_ARGS: "--bundled-git"
       - GIT_VERSION: "v2.41.0"
-  rules:
-    - *rules_run_always
 
 build:binaries:
   needs: []
@@ -212,7 +205,6 @@ build:binaries:
     matrix:
       - GO_VERSION: [ "1.20" ]
   rules:
-    - *rules_run_always
     - if: $CI_COMMIT_TAG
 
 test:
@@ -234,8 +226,6 @@ test:
       # version in `datastore.CheckPostgresVersion()`.
       - POSTGRES_VERSION: "11-alpine"
         TEST_TARGET: [ test, test-with-praefect ]
-  rules:
-    - *rules_run_always
 
 test:pgbouncer:
   <<: *test_definition
@@ -265,8 +255,6 @@ test:pgbouncer:
     # We need to enable per-build networking such that the PgBouncer service
     # can reach Postgres.
     TEST_TARGET: "test-with-praefect"
-  rules:
-    - *rules_run_always
 
 test:nightly:
   <<: *test_definition
@@ -289,9 +277,6 @@ test:praefect_smoke:
     - envsubst < _support/config.praefect.toml.ci-sql-test > config.praefect.toml
     - ./_build/bin/praefect -config config.praefect.toml sql-ping
     - ./_build/bin/praefect -config config.praefect.toml sql-migrate
-  rules:
-    - *rules_run_always
-
 
 test:sha256:
   <<: *test_definition
@@ -299,9 +284,6 @@ test:sha256:
     matrix:
       - TEST_TARGET: [ test, test-with-praefect ]
         TEST_WITH_SHA256: "YesPlease"
-  rules:
-    - *rules_run_always
-
 
 test:fips:
   <<: *test_definition
@@ -387,8 +369,6 @@ verify:docs:
   stage: analyze
   script:
     - make lint-docs
-  rules:
-    - *rules_run_always
 
 verify:
   needs: []
@@ -406,8 +386,6 @@ verify:
       - _build/proto.diff
       - proto/go/gitalypb/*
     when: on_failure
-  rules:
-    - *rules_run_always
 
 dbschema:
   needs: []
@@ -427,8 +405,6 @@ dbschema:
     paths:
       - _support/praefect-schema.sql
     when: on_failure
-  rules:
-    - *rules_run_always
 
 semgrep-sast:
   needs: []
@@ -438,7 +414,6 @@ semgrep-sast:
   rules:
     - if: $SAST_DISABLED
       when: never
-    - *rules_run_always
 
 license_scanning:
   needs: []
@@ -446,7 +421,6 @@ license_scanning:
   rules:
     - if: $LICENSE_SCANNING_DISABLED
       when: never
-    - *rules_run_always
   variables:
     LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=.'
 
@@ -456,7 +430,6 @@ secret_detection:
   rules:
     - if: $SECRET_DETECTION_DISABLED
       when: never
-    - *rules_run_always
 
 build-proto-gem:
   needs: []