Merge "Fix mixed canonical/non-canonical project merge" into feature/zuulv3

2017-12-06 18:34:17 +00:00
parent 748a6f8b60 7207c89dde
commit 6fca449e7b
3 changed files with 18 additions and 5 deletions
--- a/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/tenant-parser/git/common-config/zuul.yaml
@@ -18,8 +18,10 @@
 - job:
    name: common-config-job

+# Use the canonical name here. This should be merged with the org/project1 in
+# the other repo.
 - project:
-    name: org/project1
+    name: review.example.com/org/project1
    check:
      jobs:
        - common-config-job