Merge "Don't overwrite result data in compat mode"

2022-04-19 06:17:04 +00:00
parent 55f77c0f80 e67d243bf2
commit 948ff0a491
5 changed files with 72 additions and 3 deletions
--- a/tests/fixtures/config/single-tenant/git/org_project3/README
+++ b/tests/fixtures/config/single-tenant/git/org_project3/README
@@ -0,0 +1 @@
+test
--- a/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml
@@ -0,0 +1,25 @@
+- project:
+    check:
+      jobs:
+        - project-merge
+        - project-test1:
+            dependencies: project-merge
+        - project-test2:
+            dependencies: project-merge
+        - project1-project2-integration:
+            dependencies:
+              - project-test1
+              - project-test2
+    gate:
+      queue: integrated
+      jobs:
+        - project-merge
+        - project-test1:
+            dependencies: project-merge
+        - project-test2:
+            dependencies: project-merge
+        - project1-project2-integration:
+            dependencies:
+              - project-merge
+              - project-test1
+              - project-test2
--- a/tests/fixtures/config/single-tenant/main-model-upgrade.yaml
+++ b/tests/fixtures/config/single-tenant/main-model-upgrade.yaml
@@ -0,0 +1,11 @@
+- tenant:
+    name: tenant-one
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project
+          - org/project1
+          - org/project2
+          - org/project3