Merge "Remove v3 project template test" into feature/zuulv3

This commit is contained in:
Jenkins 2016-12-08 03:49:04 +00:00 committed by Gerrit Code Review
commit b2652937f9
4 changed files with 0 additions and 85 deletions

View File

@ -1,59 +0,0 @@
- pipeline:
name: check
manager: independent
source:
gerrit
trigger:
gerrit:
- event: patchset-created
success:
gerrit:
verified: 1
failure:
gerrit:
verified: -1
- pipeline:
name: gate
manager: dependent
success-message: Build succeeded (gate).
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
- job:
name:
project-test1
- job:
name:
project-test2
- project-template:
name: test-template
gate:
jobs:
- project-test2
- project:
name: org/project
templates:
- test-template
gate:
jobs:
- project-test1

View File

@ -1 +0,0 @@
test

View File

@ -1,6 +0,0 @@
- tenant:
name: tenant-one
source:
gerrit:
config-repos:
- common-config

View File

@ -110,22 +110,3 @@ class TestInRepoConfig(AnsibleZuulTestCase):
"A should report start and success")
self.assertIn('tenant-one-gate', A.messages[1],
"A should transit tenant-one gate")
class TestProjectTemplate(AnsibleZuulTestCase):
tenant_config_file = 'config/project-template/main.yaml'
def test(self):
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
A.addApproval('code-review', 2)
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
self.waitUntilSettled()
self.assertEqual(self.getJobFromHistory('project-test1').result,
'SUCCESS')
self.assertEqual(self.getJobFromHistory('project-test2').result,
'SUCCESS')
self.assertEqual(A.data['status'], 'MERGED')
self.assertEqual(A.reported, 2,
"A should report start and success")
self.assertIn('gate', A.messages[1],
"A should transit gate")