From 548c43c26564d74dba97a4495ecb29a1bde9ed17 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 5 Dec 2017 14:16:32 +1100 Subject: [PATCH] Update playbook paths with extension These playbook paths were missing ".yaml" extentions which fails when implied matching goes away (Ie2519f2b4144761b8e4d17ec3299cf4238e16f08). Change-Id: Iff04d894fffdcec0a0861d2460635b4c44a15ae4 --- tests/fixtures/config/ansible/git/common-config/zuul.yaml | 4 ++-- .../config/branch-variants/git/project-config/zuul.yaml | 6 +++--- .../branch-variants/git/puppet-integration/.zuul.yaml | 6 +++--- .../branch-variants/git/puppet-integration/stable.zuul.yaml | 6 +++--- .../fixtures/config/job-output/git/common-config/zuul.yaml | 4 ++-- .../config/post-playbook/git/common-config/zuul.yaml | 4 ++-- .../config/pre-playbook/git/common-config/zuul.yaml | 4 ++-- tests/unit/test_v3.py | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/fixtures/config/ansible/git/common-config/zuul.yaml b/tests/fixtures/config/ansible/git/common-config/zuul.yaml index 28bfce1fbe..d0a8f7b315 100644 --- a/tests/fixtures/config/ansible/git/common-config/zuul.yaml +++ b/tests/fixtures/config/ansible/git/common-config/zuul.yaml @@ -129,10 +129,10 @@ parent: base-urls name: hello run: playbooks/hello-post.yaml - post-run: playbooks/hello-post + post-run: playbooks/hello-post.yaml - job: parent: python27 name: failpost run: playbooks/post-broken.yaml - post-run: playbooks/post-broken + post-run: playbooks/post-broken.yaml diff --git a/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml b/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml index 161e5a1fb4..48da2d40e7 100644 --- a/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml +++ b/tests/fixtures/config/branch-variants/git/project-config/zuul.yaml @@ -34,10 +34,10 @@ - job: name: base parent: null - pre-run: playbooks/base/pre + pre-run: playbooks/base/pre.yaml post-run: - - playbooks/base/post-ssh - - playbooks/base/post-logs + - playbooks/base/post-ssh.yaml + - playbooks/base/post-logs.yaml - project: name: project-config diff --git a/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml b/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml index 322927f94a..7e9cbc391a 100644 --- a/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml +++ b/tests/fixtures/config/branch-variants/git/puppet-integration/.zuul.yaml @@ -1,16 +1,16 @@ - job: name: puppet-base - pre-run: playbooks/prepare-node-common + pre-run: playbooks/prepare-node-common.yaml - job: name: puppet-module-base parent: puppet-base - pre-run: playbooks/prepare-node-unit + pre-run: playbooks/prepare-node-unit.yaml - job: name: puppet-lint parent: puppet-module-base - run: playbooks/run-lint + run: playbooks/run-lint.yaml tags: - master diff --git a/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml b/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml index 4701b80c20..74704a0037 100644 --- a/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml +++ b/tests/fixtures/config/branch-variants/git/puppet-integration/stable.zuul.yaml @@ -1,16 +1,16 @@ - job: name: puppet-base - pre-run: playbooks/prepare-node-common + pre-run: playbooks/prepare-node-common.yaml - job: name: puppet-module-base parent: puppet-base - pre-run: playbooks/prepare-node-unit + pre-run: playbooks/prepare-node-unit.yaml - job: name: puppet-lint parent: puppet-module-base - run: playbooks/run-lint + run: playbooks/run-lint.yaml tags: - stable diff --git a/tests/fixtures/config/job-output/git/common-config/zuul.yaml b/tests/fixtures/config/job-output/git/common-config/zuul.yaml index 4df0020d34..9373038b32 100644 --- a/tests/fixtures/config/job-output/git/common-config/zuul.yaml +++ b/tests/fixtures/config/job-output/git/common-config/zuul.yaml @@ -23,8 +23,8 @@ - job: name: job-output-failure - run: playbooks/job-output - post-run: playbooks/job-output-failure-post + run: playbooks/job-output.yaml + post-run: playbooks/job-output-failure-post.yaml - project: name: org/project diff --git a/tests/fixtures/config/post-playbook/git/common-config/zuul.yaml b/tests/fixtures/config/post-playbook/git/common-config/zuul.yaml index 16d7dee524..b00d4c28d4 100644 --- a/tests/fixtures/config/post-playbook/git/common-config/zuul.yaml +++ b/tests/fixtures/config/post-playbook/git/common-config/zuul.yaml @@ -18,8 +18,8 @@ - job: name: python27 - pre-run: playbooks/pre - post-run: playbooks/post + pre-run: playbooks/pre.yaml + post-run: playbooks/post.yaml vars: waitpath: '{{zuul._test.test_root}}/{{zuul.build}}/test_wait' run: playbooks/python27.yaml diff --git a/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml b/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml index 7817745a96..16f48b1ccb 100644 --- a/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml +++ b/tests/fixtures/config/pre-playbook/git/common-config/zuul.yaml @@ -18,6 +18,6 @@ - job: name: python27 - pre-run: playbooks/pre - post-run: playbooks/post + pre-run: playbooks/pre.yaml + post-run: playbooks/post.yaml run: playbooks/python27.yaml diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py index 54cf1116bb..b9c9b32533 100755 --- a/tests/unit/test_v3.py +++ b/tests/unit/test_v3.py @@ -1935,8 +1935,8 @@ class TestRoles(RoleTestCase): name: parent roles: - zuul: bare-role - pre-run: playbooks/parent-pre - post-run: playbooks/parent-post + pre-run: playbooks/parent-pre.yaml + post-run: playbooks/parent-post.yaml - job: name: project-test