Move tests to use simple_layout
* test_one_job_project
* test_nonvoting_job
* test_noop_job
Change-Id: Idf928332bbd00452ae8220bbd5238c7e61c0b376
diff --git a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml b/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml
deleted file mode 100644
index f679dce..0000000
--- a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-merge.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- hosts: all
- tasks: []
diff --git a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml b/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml
deleted file mode 100644
index f679dce..0000000
--- a/tests/fixtures/config/one-job-project/git/common-config/playbooks/one-job-project-post.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- hosts: all
- tasks: []
diff --git a/tests/fixtures/config/one-job-project/git/org_one-job-project/README b/tests/fixtures/config/one-job-project/git/org_one-job-project/README
deleted file mode 100644
index 9daeafb..0000000
--- a/tests/fixtures/config/one-job-project/git/org_one-job-project/README
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/tests/fixtures/config/one-job-project/main.yaml b/tests/fixtures/config/one-job-project/main.yaml
deleted file mode 100644
index d2da316..0000000
--- a/tests/fixtures/config/one-job-project/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- tenant:
- name: tenant-one
- source:
- gerrit:
- config-projects:
- - common-config
- untrusted-projects:
- - org/one-job-project
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 b227632..a7d99df 100644
--- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
@@ -72,17 +72,6 @@
queue-name: integration
- job:
- name: nonvoting-project-merge
- hold-following-changes: true
-
-- job:
- name: nonvoting-project-test1
-
-- job:
- name: nonvoting-project-test2
- voting: false
-
-- job:
name: project-testfile
files:
- .*-requires
@@ -177,29 +166,3 @@
post:
jobs:
- project-post
-
-- project:
- name: org/noop-project
- check:
- jobs:
- - noop
- gate:
- jobs:
- - noop
-
-- project:
- name: org/nonvoting-project
- check:
- jobs:
- - nonvoting-project-merge
- - nonvoting-project-test1:
- dependencies: nonvoting-project-merge
- - nonvoting-project-test2:
- dependencies: nonvoting-project-merge
- gate:
- jobs:
- - nonvoting-project-merge
- - nonvoting-project-test1:
- dependencies: nonvoting-project-merge
- - nonvoting-project-test2:
- dependencies: nonvoting-project-merge
diff --git a/tests/fixtures/config/single-tenant/main.yaml b/tests/fixtures/config/single-tenant/main.yaml
index 7434232..cb97158 100644
--- a/tests/fixtures/config/single-tenant/main.yaml
+++ b/tests/fixtures/config/single-tenant/main.yaml
@@ -12,10 +12,7 @@
- org/project4
- org/project5
- org/project6
- - org/one-job-project
- - org/nonvoting-project
- org/templated-project
- org/layered-project
- org/node-project
- org/conflict-project
- - org/noop-project
diff --git a/tests/fixtures/layouts/nonvoting-job.yaml b/tests/fixtures/layouts/nonvoting-job.yaml
new file mode 100644
index 0000000..fee5043
--- /dev/null
+++ b/tests/fixtures/layouts/nonvoting-job.yaml
@@ -0,0 +1,41 @@
+- pipeline:
+ name: gate
+ manager: dependent
+ success-message: Build succeeded (gate).
+ 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: nonvoting-project-merge
+ hold-following-changes: true
+
+- job:
+ name: nonvoting-project-test1
+
+- job:
+ name: nonvoting-project-test2
+ voting: false
+
+- project:
+ name: org/nonvoting-project
+ gate:
+ jobs:
+ - nonvoting-project-merge
+ - nonvoting-project-test1:
+ dependencies: nonvoting-project-merge
+ - nonvoting-project-test2:
+ dependencies: nonvoting-project-merge
diff --git a/tests/fixtures/layouts/noop-job.yaml b/tests/fixtures/layouts/noop-job.yaml
new file mode 100644
index 0000000..8081216
--- /dev/null
+++ b/tests/fixtures/layouts/noop-job.yaml
@@ -0,0 +1,26 @@
+- pipeline:
+ name: gate
+ manager: dependent
+ success-message: Build succeeded (gate).
+ trigger:
+ gerrit:
+ - event: comment-added
+ approval:
+ - approved: 1
+ success:
+ gerrit:
+ verified: 2
+ submit: true
+ failure:
+ gerrit:
+ verified: -2
+ start:
+ gerrit:
+ verified: 0
+ precedence: high
+
+- project:
+ name: org/noop-project
+ gate:
+ jobs:
+ - noop
diff --git a/tests/fixtures/config/one-job-project/git/common-config/zuul.yaml b/tests/fixtures/layouts/one-job-project.yaml
similarity index 100%
rename from tests/fixtures/config/one-job-project/git/common-config/zuul.yaml
rename to tests/fixtures/layouts/one-job-project.yaml