Re-enable test_nonvoting_job

The layout simply needed to be translated to the new format. The test
itself still functions withoutmodification.

Change-Id: Ibdeef6e3a303faa6e67be8a2f7ed71b8529ecaf3
Story: 2000773
Task: 3428

tests/fixtures/config/single-tenant/git/common-config/zuul.yaml

@@ -92,6 +92,17 @@
 - job:
     name: experimental-project-test
 
+- job:
+    name: nonvoting-project-merge
+    hold-following-changes: true
+
+- job:
+    name: nonvoting-project-test1
+
+- job:
+    name: nonvoting-project-test2
+    voting: false
+
 - project:
     name: org/project
     check:
@@ -154,3 +165,18 @@
     gate:
       jobs:
         - noop
+
+- project:
+    name: org/nonvoting-project
+    check:
+      jobs:
+        - nonvoting-project-merge:
+            jobs:
+              - nonvoting-project-test1
+              - nonvoting-project-test2
+    gate:
+      jobs:
+        - nonvoting-project-merge:
+            jobs:
+              - nonvoting-project-test1
+              - nonvoting-project-test2

tests/fixtures/config/single-tenant/git/org_nonvoting-project/README

@@ -0,0 +1 @@
+dont tread on me

tests/test_scheduler.py

@@ -1332,7 +1332,6 @@ class TestScheduler(ZuulTestCase):
         self.assertEqual(B.reported, 2)
         self.assertEqual(C.reported, 2)
 
-    @skip("Disabled for early v3 development")
     def test_nonvoting_job(self):
         "Test that non-voting jobs don't vote."