From 077f2f3e9872bcd99864861c5f2cda5cfc90ec32 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Tue, 30 May 2017 20:16:46 +0200 Subject: [PATCH] Fix and test report urls for unknown failures The failure-url is not used when formatting jobs with a result of e.g. POST_FAILURE or TIME_OUT. Fix this by defaulting to the failure-url for any non-success result. This also enhances the test_playbook test with a broken post playbook and tests for the correct urls. Change-Id: I8485dee83e36275a1dd439f12cf8c0fdf90999ca --- .../common-config/playbooks/post-broken.yaml | 5 ++ .../ansible/git/common-config/zuul.yaml | 11 +++++ .../config/ansible/git/org_project/.zuul.yaml | 1 + tests/unit/test_v3.py | 47 ++++++++++++------- zuul/model.py | 2 +- 5 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 tests/fixtures/config/ansible/git/common-config/playbooks/post-broken.yaml diff --git a/tests/fixtures/config/ansible/git/common-config/playbooks/post-broken.yaml b/tests/fixtures/config/ansible/git/common-config/playbooks/post-broken.yaml new file mode 100644 index 0000000000..cf61187e05 --- /dev/null +++ b/tests/fixtures/config/ansible/git/common-config/playbooks/post-broken.yaml @@ -0,0 +1,5 @@ +- hosts: all + tasks: + - shell: |+ + echo "I am broken" + exit 1 diff --git a/tests/fixtures/config/ansible/git/common-config/zuul.yaml b/tests/fixtures/config/ansible/git/common-config/zuul.yaml index fd3fc6dc82..aa57d080c3 100644 --- a/tests/fixtures/config/ansible/git/common-config/zuul.yaml +++ b/tests/fixtures/config/ansible/git/common-config/zuul.yaml @@ -48,8 +48,13 @@ Z3QSO1NjbBxWnaHKZYT7nkrJm8AMCgZU0ZArFLpaufKCeiK5ECSsDxic4FIsY1OkWT42qEUfL0Wd +150AKGNZpPJnnP3QYY4W/MWcKH/zdO400+zWN52WevbSqZy90tqKDJrBkMl1ydqbuw1E4ZHvIs= +- job: + name: base-urls + success-url: https://success.example.com/zuul-logs/{build.uuid}/ + failure-url: https://failure.example.com/zuul-logs/{build.uuid}/ - job: + parent: base-urls name: python27 pre-run: playbooks/pre post-run: playbooks/post @@ -74,5 +79,11 @@ label: ubuntu-xenial - job: + parent: base-urls name: hello post-run: playbooks/hello-post + +- job: + parent: python27 + name: failpost + post-run: playbooks/post-broken diff --git a/tests/fixtures/config/ansible/git/org_project/.zuul.yaml b/tests/fixtures/config/ansible/git/org_project/.zuul.yaml index ca734c53d4..e87d9888a3 100644 --- a/tests/fixtures/config/ansible/git/org_project/.zuul.yaml +++ b/tests/fixtures/config/ansible/git/org_project/.zuul.yaml @@ -15,3 +15,4 @@ - check-vars - timeout - hello-world + - failpost diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py index 7d84b1f434..42bac3be75 100644 --- a/tests/unit/test_v3.py +++ b/tests/unit/test_v3.py @@ -431,39 +431,52 @@ class TestAnsible(AnsibleZuulTestCase): A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) self.waitUntilSettled() - build = self.getJobFromHistory('timeout') - self.assertEqual(build.result, 'TIMED_OUT') - build = self.getJobFromHistory('faillocal') - self.assertEqual(build.result, 'FAILURE') - build = self.getJobFromHistory('check-vars') - self.assertEqual(build.result, 'SUCCESS') - build = self.getJobFromHistory('hello-world') - self.assertEqual(build.result, 'SUCCESS') - build = self.getJobFromHistory('python27') - self.assertEqual(build.result, 'SUCCESS') - flag_path = os.path.join(self.test_root, build.uuid + '.flag') + build_timeout = self.getJobFromHistory('timeout') + self.assertEqual(build_timeout.result, 'TIMED_OUT') + build_faillocal = self.getJobFromHistory('faillocal') + self.assertEqual(build_faillocal.result, 'FAILURE') + build_failpost = self.getJobFromHistory('failpost') + self.assertEqual(build_failpost.result, 'POST_FAILURE') + build_check_vars = self.getJobFromHistory('check-vars') + self.assertEqual(build_check_vars.result, 'SUCCESS') + build_hello = self.getJobFromHistory('hello-world') + self.assertEqual(build_hello.result, 'SUCCESS') + build_python27 = self.getJobFromHistory('python27') + self.assertEqual(build_python27.result, 'SUCCESS') + flag_path = os.path.join(self.test_root, build_python27.uuid + '.flag') self.assertTrue(os.path.exists(flag_path)) - copied_path = os.path.join(self.test_root, build.uuid + + copied_path = os.path.join(self.test_root, build_python27.uuid + '.copied') self.assertTrue(os.path.exists(copied_path)) - failed_path = os.path.join(self.test_root, build.uuid + + failed_path = os.path.join(self.test_root, build_python27.uuid + '.failed') self.assertFalse(os.path.exists(failed_path)) - pre_flag_path = os.path.join(self.test_root, build.uuid + + pre_flag_path = os.path.join(self.test_root, build_python27.uuid + '.pre.flag') self.assertTrue(os.path.exists(pre_flag_path)) - post_flag_path = os.path.join(self.test_root, build.uuid + + post_flag_path = os.path.join(self.test_root, build_python27.uuid + '.post.flag') self.assertTrue(os.path.exists(post_flag_path)) bare_role_flag_path = os.path.join(self.test_root, - build.uuid + '.bare-role.flag') + build_python27.uuid + + '.bare-role.flag') self.assertTrue(os.path.exists(bare_role_flag_path)) secrets_path = os.path.join(self.test_root, - build.uuid + '.secrets') + build_python27.uuid + '.secrets') with open(secrets_path) as f: self.assertEqual(f.read(), "test-username test-password") + msg = A.messages[0] + success = "{} https://success.example.com/zuul-logs/{}" + fail = "{} https://failure.example.com/zuul-logs/{}" + self.assertIn(success.format("python27", build_python27.uuid), msg) + self.assertIn(fail.format("faillocal", build_faillocal.uuid), msg) + self.assertIn(success.format("check-vars", build_check_vars.uuid), msg) + self.assertIn(success.format("hello-world", build_hello.uuid), msg) + self.assertIn(fail.format("timeout", build_timeout.uuid), msg) + self.assertIn(fail.format("failpost", build_failpost.uuid), msg) + class TestBrokenConfig(ZuulTestCase): # Test that we get an appropriate syntax error if we start with a diff --git a/zuul/model.py b/zuul/model.py index a89c6d13eb..c24244de6c 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -1618,7 +1618,7 @@ class QueueItem(object): result = job.success_message if job.success_url: pattern = job.success_url - elif result == 'FAILURE': + else: if job.failure_message: result = job.failure_message if job.failure_url: