opendev/puppet-openstackid
Code Issues Proposed changes

Clean up bashate failures

Browse Source 
Fix all of the bashate failures.  Also, bashate will install its negative
tests in its virtualenv, so we need to generate a list of files to pass to
bashate that excludes .tox/

Change-Id: I55559bf6137f705aec9a7f277928ad8d4cadc2ca
This commit is contained in:
K Jonathan Harker
2014-09-03 19:06:12 -07:00
parent 55ab25b180
commit 71e764582d
3 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
files/functions
View File

@@ -1,4 +1,4 @@
function print_help() { function print_help {
echo "Usage: `basename $0` command [options]" echo "Usage: `basename $0` command [options]"
echo "" echo ""
echo "Commands:" echo "Commands:"
@@ -8,7 +8,7 @@ function print_help() {
echo "" echo ""
} }
function site_init() { function site_init {
if [ ! $1 ]; then if [ ! $1 ]; then
echo "ERROR: site parameter mandatory" echo "ERROR: site parameter mandatory"
exit 1 exit 1
@@ -71,7 +71,7 @@ function site_init() {
ln -s $SITE_ROOT/slot0 $SITE_ROOT/w ln -s $SITE_ROOT/slot0 $SITE_ROOT/w
} }
function site_status() { function site_status {
if [ ! $1 ]; then if [ ! $1 ]; then
echo "ERROR: site parameter mandatory" echo "ERROR: site parameter mandatory"
exit 1 exit 1
@@ -101,18 +101,18 @@ function site_status() {
fi fi
} }
function fetch_catalog() { function fetch_catalog {
curl --silent $SOURCE_ROOT > $SITE_ROOT/releases.lst curl --silent $SOURCE_ROOT > $SITE_ROOT/releases.lst
grep -q "^<!DOCTYPE HTML PUBLIC" $SITE_ROOT/releases.lst grep -q "^<!DOCTYPE HTML PUBLIC" $SITE_ROOT/releases.lst
} }
function catalog_get_version() { function catalog_get_version {
RAW_LINE=`cat $SITE_ROOT/releases.lst | grep "$RELEASE_NAME" | sed "s/<[^>]\+>//g" | sed -r "s/^$RELEASE_NAME//"` RAW_LINE=`cat $SITE_ROOT/releases.lst | grep "$RELEASE_NAME" | sed "s/<[^>]\+>//g" | sed -r "s/^$RELEASE_NAME//"`
RELEASE_DATE=`echo $RAW_LINE | awk '{ print $1 " " $2}'` RELEASE_DATE=`echo $RAW_LINE | awk '{ print $1 " " $2}'`
echo $RELEASE_DATE echo $RELEASE_DATE
} }
function site_update() { function site_update {
if [ ! $1 ]; then if [ ! $1 ]; then
echo "ERROR: missing site parameter" echo "ERROR: missing site parameter"
exit 1 exit 1