From fabcf1a402e430c09242e72302f60f14cefa240b Mon Sep 17 00:00:00 2001
From: "John L. Villalovos" <openstack.org@sodarock.com>
Date: Thu, 22 Feb 2018 11:01:21 -0800
Subject: [PATCH] Move execution of 'tools/check-releasenotes.py' to pep8

The 'releasenotes' gate job does not run our tox section. This allowed a
releasenote to land that had a filename in an incorrect format because
it was not created with 'reno new'.

Move the running of 'tools/check-releasenotes.py' to the pep8 section
and whitelist the releasenote that got merged.

Change-Id: Id5bd8e0cbc9186c89f682224088a8f23998d59c3
---
 tools/check-releasenotes.py | 2 ++
 tox.ini                     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/check-releasenotes.py b/tools/check-releasenotes.py
index 1bf94bc5f7..a01cb2f1e8 100755
--- a/tools/check-releasenotes.py
+++ b/tools/check-releasenotes.py
@@ -25,6 +25,8 @@ RELEASE_NOTES_DIR = "releasenotes/notes/"
 IGNORE_FILES = (
     'releasenotes/notes/fix-get-deploy-info-port.yaml',  # Newton 6.0.0
     'releasenotes/notes/fix-mitaka-ipa-iscsi.yaml',      # Newton 6.0.0
+    # Rocky, accidentally got in
+    'releasenotes/notes/add-id-and-uuid-filtering-to-sqalchemy-api.yaml',
 )
 
 
diff --git a/tox.ini b/tox.ini
index 9eed2f0f3e..39b2f2f82f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,8 @@ commands =
   {toxinidir}/tools/run_bashate.sh {toxinidir}
   # Check the *.rst files
   doc8 README.rst CONTRIBUTING.rst doc/source --ignore D001
+  # Check to make sure reno releasenotes created with 'reno new'
+  {toxinidir}/tools/check-releasenotes.py
 
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
@@ -88,7 +90,6 @@ commands =
 
 [testenv:releasenotes]
 commands =
-  {toxinidir}/tools/check-releasenotes.py
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:venv]