Merge "Remove deprecated pipeline queue configuration"

32 files changed, 61 insertions, 301 deletions

diff --git a/tests/fixtures/config/authorization/rules-templating/git/common-config/zuul.yaml b/tests/fixtures/config/authorization/rules-templating/git/common-config/zuul.yaml
index 750d578ec..b4ca647e0 100644
--- a/tests/fixtures/config/authorization/rules-templating/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/authorization/rules-templating/git/common-config/zuul.yaml
@@ -126,6 +126,7 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -136,7 +137,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -148,6 +148,7 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -158,7 +159,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -170,6 +170,7 @@
 
 - project:
     name: common-config
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -180,7 +181,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/authorization/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/authorization/single-tenant/git/common-config/zuul.yaml
index 750d578ec..b4ca647e0 100644
--- a/tests/fixtures/config/authorization/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/authorization/single-tenant/git/common-config/zuul.yaml
@@ -126,6 +126,7 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -136,7 +137,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -148,6 +148,7 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -158,7 +159,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -170,6 +170,7 @@
 
 - project:
     name: common-config
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -180,7 +181,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/change-queues/git/common-config/zuul.d/config.yaml b/tests/fixtures/config/change-queues/git/common-config/zuul.d/config.yaml
index 0fe373866..e548b52b6 100644
--- a/tests/fixtures/config/change-queues/git/common-config/zuul.d/config.yaml
+++ b/tests/fixtures/config/change-queues/git/common-config/zuul.d/config.yaml
@@ -29,8 +29,8 @@
 
 - project:
     name: org/project2
+    queue: integrated
     gate:
-      queue: integrated
       jobs:
         - project-test
 
diff --git a/tests/fixtures/config/change-queues/git/org_project/.zuul.yaml b/tests/fixtures/config/change-queues/git/org_project/.zuul.yaml
index b62c7ee67..765982d8f 100644
--- a/tests/fixtures/config/change-queues/git/org_project/.zuul.yaml
+++ b/tests/fixtures/config/change-queues/git/org_project/.zuul.yaml
@@ -4,7 +4,7 @@
     per-branch: false
 
 - project:
+    queue: integrated
     gate:
-      queue: integrated
       jobs:
         - project-test
diff --git a/tests/fixtures/config/change-queues/git/org_project3/zuul.d/project.yaml b/tests/fixtures/config/change-queues/git/org_project3/zuul.d/project.yaml
index e1a297bd5..f80c5c571 100644
--- a/tests/fixtures/config/change-queues/git/org_project3/zuul.d/project.yaml
+++ b/tests/fixtures/config/change-queues/git/org_project3/zuul.d/project.yaml
@@ -1,5 +1,5 @@
 - project:
+    queue: integrated-untrusted
     gate:
-      queue: integrated-untrusted
       jobs:
         - project-test
diff --git a/tests/fixtures/config/cross-source-pagure/git/common-config-gerrit/zuul.yaml b/tests/fixtures/config/cross-source-pagure/git/common-config-gerrit/zuul.yaml
index 57566f260..5d8f8c7a7 100644
--- a/tests/fixtures/config/cross-source-pagure/git/common-config-gerrit/zuul.yaml
+++ b/tests/fixtures/config/cross-source-pagure/git/common-config-gerrit/zuul.yaml
@@ -94,6 +94,7 @@
 
 - project:
     name: gerrit/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -104,7 +105,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -116,6 +116,7 @@
 
 - project:
     name: pagure/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -126,7 +127,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/cross-source-pagure/git/github_common-config/zuul.yaml b/tests/fixtures/config/cross-source-pagure/git/github_common-config/zuul.yaml
index f7bbd4784..575020246 100644
--- a/tests/fixtures/config/cross-source-pagure/git/github_common-config/zuul.yaml
+++ b/tests/fixtures/config/cross-source-pagure/git/github_common-config/zuul.yaml
@@ -92,6 +92,7 @@
 
 - project:
     name: github/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -102,7 +103,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -114,6 +114,7 @@
 
 - project:
     name: pagure/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -124,7 +125,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/cross-source/git/common-config/zuul.yaml b/tests/fixtures/config/cross-source/git/common-config/zuul.yaml
index abdc34afa..47ce3caea 100644
--- a/tests/fixtures/config/cross-source/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/cross-source/git/common-config/zuul.yaml
@@ -125,6 +125,7 @@
 
 - project:
     name: gerrit/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -135,7 +136,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -147,6 +147,7 @@
 
 - project:
     name: github/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -157,7 +158,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml b/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml
index dbd63c517..c822736ad 100755
--- a/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/duplicate-pipeline/git/common-config/zuul.yaml
@@ -36,11 +36,10 @@
 
 - project:
     name: org/project
+    queue: integrated
     dup1:
-      queue: integrated
       jobs:
         - project-test1
     dup2:
-      queue: integrated
       jobs:
         - project-test1
diff --git a/tests/fixtures/config/openstack/git/project-config/zuul.yaml b/tests/fixtures/config/openstack/git/project-config/zuul.yaml
index 93bdb1132..4f06a1feb 100644
--- a/tests/fixtures/config/openstack/git/project-config/zuul.yaml
+++ b/tests/fixtures/config/openstack/git/project-config/zuul.yaml
@@ -80,20 +80,20 @@
 
 - project:
     name: openstack/nova
+    queue: integrated
     templates:
       - python-jobs
     check:
       jobs:
         - dsvm
-    gate:
-      queue: integrated
+    gate: {}
 
 - project:
     name: openstack/keystone
+    queue: integrated
     templates:
       - python-jobs
     check:
       jobs:
         - dsvm
-    gate:
-      queue: integrated
+    gate: {}
diff --git a/tests/fixtures/config/provides-requires-pause/git/org_project1/zuul.yaml b/tests/fixtures/config/provides-requires-pause/git/org_project1/zuul.yaml
index 412fe2c18..fb8a6eea0 100644
--- a/tests/fixtures/config/provides-requires-pause/git/org_project1/zuul.yaml
+++ b/tests/fixtures/config/provides-requires-pause/git/org_project1/zuul.yaml
@@ -11,6 +11,7 @@
     run: playbooks/image-user.yaml
 
 - project:
+    queue: integrated
     check:
       jobs:
         - image-builder
@@ -18,7 +19,6 @@
             dependencies:
               - image-builder
     gate:
-      queue: integrated
       jobs:
         - image-builder
         - image-user:
diff --git a/tests/fixtures/config/provides-requires-pause/git/org_project2/zuul.yaml b/tests/fixtures/config/provides-requires-pause/git/org_project2/zuul.yaml
index e9e6b5867..7f8de1178 100644
--- a/tests/fixtures/config/provides-requires-pause/git/org_project2/zuul.yaml
+++ b/tests/fixtures/config/provides-requires-pause/git/org_project2/zuul.yaml
@@ -1,8 +1,8 @@
 - project:
+    queue: integrated
     check:
       jobs:
         - image-user
     gate:
-      queue: integrated
       jobs:
         - image-user
diff --git a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
index b29f5a654..cbc523a8b 100644
--- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
@@ -148,8 +148,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      # This will be overridden on project level
-      queue: integrated-overridden
       jobs:
         - project-merge
         - project-test1:
@@ -164,6 +162,7 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -174,7 +173,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -186,6 +184,7 @@
 
 - project:
     name: common-config
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -196,7 +195,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml b/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml
index 3effc3cb4..a588b7aa2 100644
--- a/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/org_project3/zuul.yaml
@@ -1,4 +1,5 @@
 - project:
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -11,7 +12,6 @@
               - project-test1
               - project-test2
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml b/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml
index 57d50ca43..6192249c6 100644
--- a/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/sql-driver/git/common-config/zuul.yaml
@@ -105,6 +105,7 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -113,7 +114,6 @@
         - project-test2:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
deleted file mode 100644
index cd8ce1906..000000000
--- a/tests/fixtures/layout.yaml
+++ /dev/null
@@ -1,233 +0,0 @@
-includes:
-  - python-file: custom_functions.py
-
-pipelines:
-  - name: check
-    manager: independent
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: patchset-created
-    success:
-      gerrit:
-        Verified: 1
-    failure:
-      gerrit:
-        Verified: -1
-
-  - name: post
-    manager: independent
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: ref-updated
-          ref: ^(?!refs/).*$
-
-  - name: gate
-    manager: dependent
-    failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: comment-added
-          approval:
-            - Approved: 1
-    success:
-      gerrit:
-        Verified: 2
-        submit: true
-    failure:
-      gerrit:
-        Verified: -2
-    start:
-      gerrit:
-        Verified: 0
-    precedence: high
-
-  - name: unused
-    manager: independent
-    dequeue-on-new-patchset: false
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: comment-added
-          approval:
-            - Approved: 1
-
-  - name: dup1
-    manager: independent
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: change-restored
-    success:
-      gerrit:
-        Verified: 1
-    failure:
-      gerrit:
-        Verified: -1
-
-  - name: dup2
-    manager: independent
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: change-restored
-    success:
-      gerrit:
-        Verified: 1
-    failure:
-      gerrit:
-        Verified: -1
-
-  - name: conflict
-    manager: dependent
-    failure-message: Build failed.  For information on how to proceed, see http://wiki.example.org/Test_Failures
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: comment-added
-          approval:
-            - Approved: 1
-    success:
-      gerrit:
-        Verified: 2
-        submit: true
-    failure:
-      gerrit:
-        Verified: -2
-    start:
-      gerrit:
-        Verified: 0
-
-  - name: experimental
-    manager: independent
-    source:
-      gerrit
-    trigger:
-      gerrit:
-        - event: patchset-created
-    success:
-      gerrit: {}
-    failure:
-      gerrit: {}
-
-jobs:
-  - name: ^.*-merge$
-    failure-message: Unable to merge change
-    hold-following-changes: true
-    tags: merge
-  - name: nonvoting-project-test2
-    voting: false
-  - name: project-testfile
-    files:
-      - '.*-requires'
-  - name: project1-project2-integration
-    queue-name: integration
-  - name: mutex-one
-    mutex: test-mutex
-  - name: mutex-two
-    mutex: test-mutex
-  - name: project1-merge
-    tags:
-      - project1
-      - extratag
-
-projects:
-  - name: org/project
-    merge-mode: cherry-pick
-    check:
-      - project-merge:
-        - project-test1
-        - project-test2
-        - project-testfile
-    gate:
-      - project-merge:
-        - project-test1
-        - project-test2
-        - project-testfile
-    post:
-      - project-post
-    dup1:
-      - project-test1
-    dup2:
-      - project-test1
-
-  - name: org/project1
-    check:
-      - project1-merge:
-        - project1-test1
-        - project1-test2
-        - project1-project2-integration
-    gate:
-      - project1-merge:
-        - project1-test1
-        - project1-test2
-        - project1-project2-integration
-    post:
-      - project1-post
-
-  - name: org/project2
-    check:
-      - project2-merge:
-        - project2-test1
-        - project2-test2
-        - project1-project2-integration
-    gate:
-      - project2-merge:
-        - project2-test1
-        - project2-test2
-        - project1-project2-integration
-    post:
-      - project2-post
-
-  - name: org/project3
-    check:
-      - project3-merge:
-        - project3-test1
-        - project3-test2
-        - project1-project2-integration
-    gate:
-      - project3-merge:
-        - project3-test1
-        - project3-test2
-        - project1-project2-integration
-    post:
-      - project3-post
-
-  - name: org/nonvoting-project
-    check:
-      - nonvoting-project-merge:
-        - nonvoting-project-test1
-        - nonvoting-project-test2
-    gate:
-      - nonvoting-project-merge:
-        - nonvoting-project-test1
-        - nonvoting-project-test2
-    post:
-      - nonvoting-project-post
-
-  - name: org/conflict-project
-    conflict:
-      - conflict-project-merge:
-        - conflict-project-test1
-        - conflict-project-test2
-
-  - name: org/noop-project
-    gate:
-      - noop
-
-  - name: org/experimental-project
-    experimental:
-      - experimental-project-test
-
-  - name: org/no-jobs-project
-    check:
-      - project-testfile
diff --git a/tests/fixtures/layouts/crd-github.yaml b/tests/fixtures/layouts/crd-github.yaml
index 6ef881f9b..bc938dec3 100644
--- a/tests/fixtures/layouts/crd-github.yaml
+++ b/tests/fixtures/layouts/crd-github.yaml
@@ -70,15 +70,15 @@
 
 - project:
     name: org/project3
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
         - project3-test
 
 - project:
     name: org/project4
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
         - project4-test
 
diff --git a/tests/fixtures/layouts/crd-gitlab.yaml b/tests/fixtures/layouts/crd-gitlab.yaml
index 210390b93..1884e4026 100644
--- a/tests/fixtures/layouts/crd-gitlab.yaml
+++ b/tests/fixtures/layouts/crd-gitlab.yaml
@@ -55,14 +55,14 @@
 
 - project:
     name: org/project3
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
         - project3-test
 
 - project:
     name: org/project4
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
-        - project4-test
\ No newline at end of file
+        - project4-test
diff --git a/tests/fixtures/layouts/crd-pagure.yaml b/tests/fixtures/layouts/crd-pagure.yaml
index e0828aeeb..79e041f9a 100644
--- a/tests/fixtures/layouts/crd-pagure.yaml
+++ b/tests/fixtures/layouts/crd-pagure.yaml
@@ -52,14 +52,14 @@
 
 - project:
     name: org/project3
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
         - project3-test
 
 - project:
     name: org/project4
+    queue: cogated
     gate:
-      queue: cogated
       jobs:
         - project4-test
diff --git a/tests/fixtures/layouts/provides-requires-two-jobs.yaml b/tests/fixtures/layouts/provides-requires-two-jobs.yaml
index 9d1008752..7568c31d8 100644
--- a/tests/fixtures/layouts/provides-requires-two-jobs.yaml
+++ b/tests/fixtures/layouts/provides-requires-two-jobs.yaml
@@ -51,11 +51,11 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - image-builder
     gate:
-      queue: integrated
       jobs:
         - image-builder
         - image-user:
@@ -63,10 +63,10 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - image-user
     gate:
-      queue: integrated
       jobs:
         - image-user
diff --git a/tests/fixtures/layouts/provides-requires.yaml b/tests/fixtures/layouts/provides-requires.yaml
index 17b17bab1..aeb959bfd 100644
--- a/tests/fixtures/layouts/provides-requires.yaml
+++ b/tests/fixtures/layouts/provides-requires.yaml
@@ -72,18 +72,19 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - image-builder
         - library-builder
         - hold
     gate:
-      queue: integrated
       jobs:
         - image-builder
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - image-user
@@ -91,7 +92,6 @@
         - library-user2
         - hold
     gate:
-      queue: integrated
       jobs:
         - image-user
 
diff --git a/tests/fixtures/layouts/regex-queue.yaml b/tests/fixtures/layouts/regex-queue.yaml
index 0bacbec0e..5650e2611 100644
--- a/tests/fixtures/layouts/regex-queue.yaml
+++ b/tests/fixtures/layouts/regex-queue.yaml
@@ -10,8 +10,8 @@
 
 - project:
     name: ^.*$
+    queue: integrated
     gate:
-      queue: integrated
       jobs:
         - base
 
diff --git a/tests/fixtures/layouts/regex-template-queue.yaml b/tests/fixtures/layouts/regex-template-queue.yaml
index f809e0e43..38eb596ea 100644
--- a/tests/fixtures/layouts/regex-template-queue.yaml
+++ b/tests/fixtures/layouts/regex-template-queue.yaml
@@ -10,8 +10,8 @@
 
 - project-template:
     name: integrated-jobs
+    queue: integrated
     gate:
-      queue: integrated
       jobs:
         - base
 
diff --git a/tests/fixtures/layouts/repo-checkout-four-project.yaml b/tests/fixtures/layouts/repo-checkout-four-project.yaml
index 11212e85f..433e6f584 100644
--- a/tests/fixtures/layouts/repo-checkout-four-project.yaml
+++ b/tests/fixtures/layouts/repo-checkout-four-project.yaml
@@ -48,40 +48,40 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project3
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project4
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
diff --git a/tests/fixtures/layouts/repo-checkout-six-project.yaml b/tests/fixtures/layouts/repo-checkout-six-project.yaml
index 48786654b..92f2f0a20 100644
--- a/tests/fixtures/layouts/repo-checkout-six-project.yaml
+++ b/tests/fixtures/layouts/repo-checkout-six-project.yaml
@@ -51,60 +51,60 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project3
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project4
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project5
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project6
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
diff --git a/tests/fixtures/layouts/repo-checkout-two-project.yaml b/tests/fixtures/layouts/repo-checkout-two-project.yaml
index 64c6ee943..6cf66a994 100644
--- a/tests/fixtures/layouts/repo-checkout-two-project.yaml
+++ b/tests/fixtures/layouts/repo-checkout-two-project.yaml
@@ -46,20 +46,20 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
diff --git a/tests/fixtures/layouts/serial.yaml b/tests/fixtures/layouts/serial.yaml
index 5a744ce82..70d16bd1a 100644
--- a/tests/fixtures/layouts/serial.yaml
+++ b/tests/fixtures/layouts/serial.yaml
@@ -35,14 +35,14 @@
 
 - project:
     name: org/project1
+    queue: shared
     deploy:
-      queue: shared
       jobs:
         - job1
 
 - project:
     name: org/project2
+    queue: shared
     deploy:
-      queue: shared
       jobs:
         - job1
diff --git a/tests/fixtures/layouts/template-queue.yaml b/tests/fixtures/layouts/template-queue.yaml
index 407956feb..bc841e38b 100644
--- a/tests/fixtures/layouts/template-queue.yaml
+++ b/tests/fixtures/layouts/template-queue.yaml
@@ -10,8 +10,8 @@
 
 - project-template:
     name: integrated-jobs
+    queue: integrated
     gate:
-      queue: integrated
       jobs:
         - base
 
diff --git a/tests/fixtures/layouts/three-projects.yaml b/tests/fixtures/layouts/three-projects.yaml
index 33e81aca5..2db072eda 100644
--- a/tests/fixtures/layouts/three-projects.yaml
+++ b/tests/fixtures/layouts/three-projects.yaml
@@ -56,6 +56,7 @@
 
 - project:
     name: org/project1
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -66,7 +67,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -78,6 +78,7 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -88,7 +89,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
@@ -100,6 +100,7 @@
 
 - project:
     name: org/project3
+    queue: integrated
     check:
       jobs:
         - project-merge
@@ -110,7 +111,6 @@
         - project1-project2-integration:
             dependencies: project-merge
     gate:
-      queue: integrated
       jobs:
         - project-merge
         - project-test1:
diff --git a/tests/fixtures/layouts/two-projects-integrated.yaml b/tests/fixtures/layouts/two-projects-integrated.yaml
index 89302f62a..7e3a07a00 100644
--- a/tests/fixtures/layouts/two-projects-integrated.yaml
+++ b/tests/fixtures/layouts/two-projects-integrated.yaml
@@ -79,11 +79,10 @@
 
 - project:
     name: org/project2
+    queue: integrated
     check:
-      queue: integrated
       jobs:
         - integration
     gate:
-      queue: integrated
       jobs:
         - integration
diff --git a/tests/unit/test_circular_dependencies.py b/tests/unit/test_circular_dependencies.py
index 292941c13..6060855cd 100644
--- a/tests/unit/test_circular_dependencies.py
+++ b/tests/unit/test_circular_dependencies.py
@@ -1077,11 +1077,11 @@ class TestGerritCircularDependencies(ZuulTestCase):
         use_job = textwrap.dedent(
             """
             - project:
+                queue: integrated
                 check:
                   jobs:
                     - new-job
                 gate:
-                  queue: integrated
                   jobs:
                     - new-job
             """)
@@ -1134,11 +1134,11 @@ class TestGerritCircularDependencies(ZuulTestCase):
                       test_var: pass
 
                 - project:
+                    queue: integrated
                     check:
                       jobs:
                         - project-vars-job
                     gate:
-                      queue: integrated
                       jobs:
                         - project-vars-job
                 """)
@@ -1330,11 +1330,11 @@ class TestGerritCircularDependencies(ZuulTestCase):
                       test_var: pass
 
                 - project:
+                    queue: integrated
                     check:
                       jobs:
                         - project-vars-job
                     gate:
-                      queue: integrated
                       jobs:
                         - project-vars-job
                 """)
diff --git a/tests/unit/test_web.py b/tests/unit/test_web.py
index b15c01a69..616b776b2 100644
--- a/tests/unit/test_web.py
+++ b/tests/unit/test_web.py
@@ -776,14 +776,11 @@ class TestWeb(BaseTestWeb):
                     'merge_mode': 'merge-resolve',
                     'pipelines': [{
                         'name': 'check',
-                        'queue_name': None,
                         'jobs': jobs,
                     }, {
                         'name': 'gate',
-                        'queue_name': 'integrated-overridden',
                         'jobs': jobs,
                     }, {'name': 'post',
-                        'queue_name': None,
                         'jobs': [[
                             {'abstract': False,
                              'ansible_version': None,