Merge "[ci] Restruct zuul_ci playbooks"

openstack · Mar 19, 2020 · d6a2110 · d6a2110
2 parents eb3506f + efe9271
commit d6a2110
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 545 deletions.
diff --git a/.zuul.d/python-jobs.yaml b/.zuul.d/python-jobs.yaml
@@ -1,9 +1,9 @@
 - job:
     name: rally-tox-base
     parent: unittests
-    pre-run: tests/ci/playbooks/rally-tox-base/pre-run.yaml
-    run: tests/ci/playbooks/rally-tox-base/run.yaml
-    post-run: tests/ci/playbooks/rally-tox-base/post-run.yaml
+    pre-run: tests/ci/playbooks/tox-install.yaml
+    run: tests/ci/playbooks/tox-run.yaml
+    post-run: tests/ci/playbooks/rally-tox-base-post-run.yaml
     description: |
       Run test for rally project.
 

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
@@ -1,8 +1,8 @@
 - job:
     name: rally-install-base
     parent: base
-    pre-run: tests/ci/playbooks/rally-install/pre.yaml
-    run: tests/ci/playbooks/rally-install/run.yaml
+    pre-run: tests/ci/playbooks/rally-install-pre.yaml
+    run: tests/ci/playbooks/rally-install-run.yaml
     timeout: 1800
 
 - job:
@@ -24,15 +24,15 @@
     name: rally-docker-build
     parent: base
     nodeset: ubuntu-bionic
-    pre-run: tests/ci/playbooks/rally-docker-build/pre.yaml
-    run: tests/ci/playbooks/rally-docker-build/run.yaml
+    pre-run: tests/ci/playbooks/rally-docker-build-pre.yaml
+    run: tests/ci/playbooks/rally-docker-build-run.yaml
     timeout: 1800
 
 - job:
     name: rally-database-migration
     parent: base
     nodeset: ubuntu-bionic
-    run: tests/ci/playbooks/rally-database-migration/run.yaml
+    run: tests/ci/playbooks/rally-database-migration-run.yaml
     timeout: 1800
 
 - project:

diff --git a/...aybooks/rally-database-migration/run.yaml → ...aybooks/rally-database-migration-run.yaml b/...aybooks/rally-database-migration/run.yaml → ...aybooks/rally-database-migration-run.yaml
diff --git a/.../ci/playbooks/rally-docker-build/pre.yaml → .../ci/playbooks/rally-docker-build-pre.yaml b/.../ci/playbooks/rally-docker-build/pre.yaml → .../ci/playbooks/rally-docker-build-pre.yaml
diff --git a/.../ci/playbooks/rally-docker-build/run.yaml → .../ci/playbooks/rally-docker-build-run.yaml b/.../ci/playbooks/rally-docker-build/run.yaml → .../ci/playbooks/rally-docker-build-run.yaml
diff --git a/tests/ci/playbooks/rally-install/pre.yaml → tests/ci/playbooks/rally-install-pre.yaml b/tests/ci/playbooks/rally-install/pre.yaml → tests/ci/playbooks/rally-install-pre.yaml
diff --git a/tests/ci/playbooks/rally-install/run.yaml → tests/ci/playbooks/rally-install-run.yaml b/tests/ci/playbooks/rally-install/run.yaml → tests/ci/playbooks/rally-install-run.yaml
diff --git a/...ci/playbooks/rally-tox-base/post-run.yaml → ...ci/playbooks/rally-tox-base-post-run.yaml b/...ci/playbooks/rally-tox-base/post-run.yaml → ...ci/playbooks/rally-tox-base-post-run.yaml
diff --git a/.../ci/playbooks/rally-tox-base/pre-run.yaml → tests/ci/playbooks/tox-install.yaml b/.../ci/playbooks/rally-tox-base/pre-run.yaml → tests/ci/playbooks/tox-install.yaml
diff --git a/tests/ci/playbooks/rally-tox-base/run.yaml → tests/ci/playbooks/tox-run.yaml b/tests/ci/playbooks/rally-tox-base/run.yaml → tests/ci/playbooks/tox-run.yaml