Merge "Have bashate run for entire project"

tools/config/check_uptodate.sh

@@ -17,14 +17,12 @@ TEMPDIR=`mktemp -d /tmp/${PROJECT_NAME}.XXXXXX`
 trap "rm -rf $TEMPDIR" EXIT
 
 oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION} --output-file ${TEMPDIR}/${CFGFILE_NAME}
-if [ $? != 0 ]
+if [ $? != 0 ]; then
-then
     exit 1
 fi
 
-if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}
+if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}; then
-then
+    echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date."
-   echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date."
+    echo "${0##*/}: Please run oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION}"
-   echo "${0##*/}: Please run oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION}"
+    exit 1
-   exit 1
 fi

tools/run_bashate.sh

@@ -12,16 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-find  "$@"  -not \( -type d -name .?\* -prune \)    \
+find  "$@"  -not \( -type d -name .?\* -prune \)                    \
-            -type f                                 \
+            -type f                                                 \
-            -not -name \*.swp                       \
+            \(                                                      \
-            -not -name \*~                          \
+                -wholename \*/devstack/files/hooks/qemu -or         \
-            -not -name \*.xml                       \
+                -wholename \*/devstack/lib/ironic -or               \
-            -not -name \*.template                  \
+                -name \*.sh                                         \
-            -not -name \*.py                        \
+            \)                                                      \
-            \(                                      \
-                -name \*.sh -or                     \
-                -wholename \*/lib/\* -or            \
-                -wholename \*/tools/\*              \
-            \)                                      \
             -print0 | xargs -0 bashate -v -iE006 -eE005,E042

tox.ini

@@ -27,7 +27,7 @@ commands =
   bash tools/flake8wrap.sh {posargs}
   # Run bashate during pep8 runs to ensure violations are caught by
   # the check and gate queues.
-  {toxinidir}/tools/run_bashate.sh {toxinidir}/devstack
+  {toxinidir}/tools/run_bashate.sh {toxinidir}
   # Check that .po and .pot files are valid:
   bash -c "find ironic -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
   # Check the *.rst files