From 4f96b2727c2afd3c3d6b888c21c8d18ba1cb7376 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 21 Apr 2016 10:37:22 +1000 Subject: [PATCH] Fix comment on requirements job Currently failures of this job leave a broken comment that doesn't match the test-result regexes, meaning that you can't see the result in the callout box. See [1]. I863d88e9a7ed2fd41924b8fc4a12dbea3ee2b205 fixes the root cause, but this message is still a bit wrong because it doesn't have the [PASSED|FAILURE] bit. I don't really see why we need this special result at all. If it fails, you have to read the log anyway to figure out what is wrong, so move the message pointing to the docs to where the failure actually happens in the logs. [1] https://review.openstack.org/#/c/292193/ Change-Id: Ie5e7d2318a510a5811c9131d56594e856da9dcc5 --- jenkins/scripts/project-requirements-change.py | 2 ++ zuul/layout.yaml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/scripts/project-requirements-change.py b/jenkins/scripts/project-requirements-change.py index 378f967949..5ed5f28d60 100755 --- a/jenkins/scripts/project-requirements-change.py +++ b/jenkins/scripts/project-requirements-change.py @@ -252,6 +252,8 @@ def main(): # report the results if failed or head_reqs.failed or branch_reqs.failed: + print("*** Incompatible requirement found") + print("*** See http://docs.openstack.org/developer/requirements/") sys.exit(1) print("Updated requirements match openstack/requirements.") diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 827bd2fd76..6d77a6cb0f 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1798,7 +1798,6 @@ jobs: branch: ^(?!master).*$ - name: ^gate-.*-requirements$ - failure-message: Incompatible requirement found; see http://docs.openstack.org/developer/requirements/ files: - '^tools/.*-requires$' - '^.*requirements.txt$'