Skip to content
代码片段 群组 项目
提交 c02fe70c 编辑于 作者: Lin Jen-Shin's avatar Lin Jen-Shin
浏览文件

Don't run EE only no_gitaly_transactions tests in FOSS

上级 b08fe3a9
No related branches found
No related tags found
无相关合并请求
...@@ -336,28 +336,27 @@ rspec system pg14 no_gitaly_transactions: ...@@ -336,28 +336,27 @@ rspec system pg14 no_gitaly_transactions:
rspec-ee migration pg14 no_gitaly_transactions: rspec-ee migration pg14 no_gitaly_transactions:
extends: extends:
- rspec-ee migration pg14 - rspec-ee migration pg14
- .gitaly-without-transactions - .ee-only-gitaly-without-transactions
rspec-ee background_migration pg14 no_gitaly_transactions: rspec-ee background_migration pg14 no_gitaly_transactions:
extends: extends:
- rspec-ee background_migration pg14 - rspec-ee background_migration pg14
- .gitaly-without-transactions - .ee-only-gitaly-without-transactions
rspec-ee unit pg14 no_gitaly_transactions: rspec-ee unit pg14 no_gitaly_transactions:
extends: extends:
- rspec-ee unit pg14 - rspec-ee unit pg14
- .gitaly-without-transactions - .ee-only-gitaly-without-transactions
rspec-ee integration pg14 no_gitaly_transactions: rspec-ee integration pg14 no_gitaly_transactions:
extends: extends:
- rspec-ee integration pg14 - rspec-ee integration pg14
- .gitaly-without-transactions - .ee-only-gitaly-without-transactions
rspec-ee system pg14 no_gitaly_transactions: rspec-ee system pg14 no_gitaly_transactions:
extends: extends:
- rspec-ee system pg14 - rspec-ee system pg14
- .gitaly-without-transactions - .ee-only-gitaly-without-transactions
# Dedicated job to test DB library code against PG13. # Dedicated job to test DB library code against PG13.
# Note that these are already tested against PG13 in the `rspec unit pg13` / `rspec-ee unit pg13` jobs. # Note that these are already tested against PG13 in the `rspec unit pg13` / `rspec-ee unit pg13` jobs.
......
...@@ -66,6 +66,12 @@ include: ...@@ -66,6 +66,12 @@ include:
variables: variables:
GITALY_TRANSACTIONS_ENABLED: "false" GITALY_TRANSACTIONS_ENABLED: "false"
.ee-only-gitaly-without-transactions:
extends:
- .rails:rules:ee-only-gitaly-without-transactions
variables:
GITALY_TRANSACTIONS_ENABLED: "false"
.rspec-base-needs: .rspec-base-needs:
needs: needs:
- !reference [.repo-from-artifacts, needs] - !reference [.repo-from-artifacts, needs]
......
...@@ -2002,6 +2002,12 @@ ...@@ -2002,6 +2002,12 @@
- <<: *if-schedule-maintenance - <<: *if-schedule-maintenance
- <<: *if-merge-request-labels-run-without-gitaly-transactions - <<: *if-merge-request-labels-run-without-gitaly-transactions
.rails:rules:ee-only-gitaly-without-transactions:
rules:
- <<: *if-not-ee
when: never
- !reference [".rails:rules:gitaly-without-transactions", rules]
.rails:rules:ee-and-foss-migration: .rails:rules:ee-and-foss-migration:
rules: rules:
- <<: *if-fork-merge-request - <<: *if-fork-merge-request
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册