diff options
author | John L. Villalovos <john.l.villalovos@intel.com> | 2016-09-21 09:02:08 -0700 |
---|---|---|
committer | John L. Villalovos <john.l.villalovos@intel.com> | 2016-09-27 11:19:33 -0700 |
commit | 3cedd6f924e2769b91c272c5229be3a5c41f0389 (patch) | |
tree | 0a4a1ff3296e7a8f2522f147e0e3ec12a25e61cd /tools | |
parent | 0e3b3e8671d9962c6f0a09b779b366ce408fe877 (diff) | |
download | ironic-3cedd6f924e2769b91c272c5229be3a5c41f0389.tar.gz |
Have bashate run for entire project
Before bashate was only running on the devstack/ directory. Have it
now run on the entire project for *.sh files.
Fix issues detected by bashate.
Also check the files:
devstack/files/hooks/qemu
devstack/lib/ironic
These files were located by doing:
$ find openstack/ironic/ -not \( -type d -name .?\* -prune \) \
-type f -not -name '*.sh' | xargs file | grep -i "shell script"
Change-Id: I238b7ab650781143fe8231e01250ab56120ff94f
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/config/check_uptodate.sh | 12 | ||||
-rwxr-xr-x | tools/run_bashate.sh | 19 |
2 files changed, 12 insertions, 19 deletions
diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh index d762c9254..0fecc4567 100755 --- a/tools/config/check_uptodate.sh +++ b/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 ] -then +if [ $? != 0 ]; then exit 1 fi -if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE} -then - echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date." - echo "${0##*/}: Please run oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION}" - exit 1 +if ! diff -u ${TEMPDIR}/${CFGFILE_NAME} ${CFGFILE}; then + echo "${0##*/}: ${PROJECT_NAME}.conf.sample is not up to date." + echo "${0##*/}: Please run oslo-config-generator --config-file=${OSLO_CFGFILE_OPTION}" + exit 1 fi diff --git a/tools/run_bashate.sh b/tools/run_bashate.sh index c3993a9f2..1f1acdb90 100755 --- a/tools/run_bashate.sh +++ b/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 \) \ - -type f \ - -not -name \*.swp \ - -not -name \*~ \ - -not -name \*.xml \ - -not -name \*.template \ - -not -name \*.py \ - \( \ - -name \*.sh -or \ - -wholename \*/lib/\* -or \ - -wholename \*/tools/\* \ - \) \ +find "$@" -not \( -type d -name .?\* -prune \) \ + -type f \ + \( \ + -wholename \*/devstack/files/hooks/qemu -or \ + -wholename \*/devstack/lib/ironic -or \ + -name \*.sh \ + \) \ -print0 | xargs -0 bashate -v -iE006 -eE005,E042 |