Fix bashate errors

A few errors were causing the bashate job to fail. This corrects those
errors and also addresses the reported warnings for a clean build.

Change-Id: Ibc5c4f006d264e2f0a4c1b8186b5e313d2905561
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2018-07-30 14:56:05 -05:00
parent 4a84419f52
commit 1aa9607e0a
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
9 changed files with 38 additions and 24 deletions

View File

@ -160,7 +160,8 @@ if [[ $FIRST_FULL = "yes" ]]; then
fi
# Set up email tags for the project owner.
PROJECT_OWNER=${PROJECT_OWNER:-$(get-repo-owner --email-tag $REPOORGNAME/$SHORTNAME || echo "")}
PROJECT_OWNER=${PROJECT_OWNER:-$(get-repo-owner \
--email-tag $REPOORGNAME/$SHORTNAME || echo "")}
if [[ "$PROJECT_OWNER" != "" ]]; then
email_tags="--email-tags ${PROJECT_OWNER}"
fi

View File

@ -33,5 +33,7 @@ else
fi
for pipeline in $pipelines; do
echo "zuul enqueue-ref --tenant=openstack --trigger=gerrit --pipeline=$pipeline --project=$repo --ref=refs/tags/$tag --newrev=$hash"
echo "zuul enqueue-ref --tenant=openstack --trigger=gerrit \
--pipeline=$pipeline --project=$repo --ref=refs/tags/$tag \
--newrev=$hash"
done

View File

@ -71,7 +71,8 @@ REF=""
UPSTREAM="git://git.openstack.org"
if [[ $(uname) != "Darwin" ]]; then
OPTS=`getopt -o hv --long branch:,cache-dir:,ref:,upstream:,workspace: -n $0 -- "$@"`
OPTS=`getopt -o hv --long branch:,cache-dir:,ref:,upstream:,workspace: \
-n $0 -- "$@"`
if [ $? != 0 ] ; then
echo "Failed parsing options." >&2
print_help

View File

@ -17,14 +17,16 @@ fi
setup_temp_space inactive-project-report
# Figure out the current series from the releases directory.
current_series=$(python -c 'import openstack_releases.defaults; print(openstack_releases.defaults.RELEASE)')
current_series=$(python -c 'import openstack_releases.defaults; \
print(openstack_releases.defaults.RELEASE)')
if [ -z "$current_series" ]; then
echo "Could not determine the current release series."
exit 1
fi
# Figure out the previous series from the releases directory.
previous_series=$(ls $BASEDIR/deliverables | grep -B1 $current_series | head -n 1)
previous_series=$(ls $BASEDIR/deliverables | grep -B1 $current_series \
| head -n 1)
if [ -z "$previous_series" ]; then
echo "Could not determine the previous release series."
exit 1
@ -40,7 +42,8 @@ for deliv in $deliverables; do
echo
list-deliverables --deliverable "$deliv" -v
repos=$(list-deliverables --deliverable "$deliv" --repos --series "$previous_series")
repos=$(list-deliverables --deliverable "$deliv" --repos \
--series "$previous_series")
for repo in $repos; do
title "$repo"

View File

@ -15,14 +15,16 @@ if [[ -z "$VIRTUAL_ENV" ]]; then
fi
# Figure out the current series from the releases directory.
current_series=$(python -c 'import openstack_releases.defaults; print(openstack_releases.defaults.RELEASE)')
current_series=$(python -c 'import openstack_releases.defaults; \
print(openstack_releases.defaults.RELEASE)')
if [ -z "$current_series" ]; then
echo "Could not determine the current release series."
exit 1
fi
# Figure out the previous series from the releases directory.
previous_series=$(ls $BASEDIR/deliverables | grep -B1 $current_series | head -n 1)
previous_series=$(ls $BASEDIR/deliverables | grep -B1 $current_series \
| head -n 1)
if [ -z "$previous_series" ]; then
echo "Could not determine the previous release series."
exit 1
@ -43,15 +45,17 @@ function show_deliv {
# Show the changes for each repo for the deliverable, as defined
# by the previous series releases.
repos=$(list-deliverables --deliverable "$deliv" --repos --series "$previous_series")
repos=$(list-deliverables --deliverable "$deliv" --repos \
--series "$previous_series")
$TOOLSDIR/list_unreleased_changes.sh master $repos
}
for deliv in $deliverables; do
owner=$(echo $(grep team $BASEDIR/deliverables/$current_series/${deliv}.yaml \
| cut -f2 -d:) \
| sed -e 's/ /-/g')
owner=$(echo \
$(grep team $BASEDIR/deliverables/$current_series/${deliv}.yaml \
| cut -f2 -d:) \
| sed -e 's/ /-/g')
if [[ -z "$owner" ]]; then
echo "ERROR: No owner for $deliv"
continue

View File

@ -32,6 +32,7 @@ if [[ -z "$VIRTUAL_ENV" ]]; then
fi
echo "Finding $SERIES library repositories..."
repos=$(list-deliverables --repos --type library --type client-library --series $SERIES)
repos=$(list-deliverables --repos --type library --type client-library \
--series $SERIES)
$TOOLSDIR/list_unreleased_changes.sh $BRANCH $repos

View File

@ -27,6 +27,7 @@ if [[ -z "$VIRTUAL_ENV" ]]; then
source $BASEDIR/.tox/venv/bin/activate
fi
repos="$(list-deliverables --repos --tag stable:follows-policy --series $SERIES)"
repos="$(list-deliverables --repos --tag stable:follows-policy \
--series $SERIES)"
$TOOLSDIR/list_unreleased_changes.sh stable/$SERIES $repos

View File

@ -45,10 +45,11 @@ function list_changes {
echo "$repo has not yet been released"
else
echo
local end_sha=$(git log -n 1 --pretty=tformat:%h)
end_sha=$(git log -n 1 --pretty=tformat:%h)
echo "Changes between $prev_tag and $end_sha"
echo
git log --no-color --no-merges --format='%h %ci %s' --graph ${prev_tag}..${end_sha}
git log --no-color --no-merges --format='%h %ci %s' \
--graph ${prev_tag}..${end_sha}
echo
fi
}

View File

@ -32,7 +32,7 @@ END="$1"
shift
REPOS="$@"
function get_branch_end() {
function get_branch_end {
local branch="$1"
if git tag | grep -q ${branch}-eol; then
@ -43,9 +43,9 @@ function get_branch_end() {
fi
}
function get_branch_base() {
function get_branch_base {
local branch="$1"
local scan_start="$(get_branch_end $branch)"
scan_start="$(get_branch_end $branch)"
git log --decorate --oneline ..${scan_start} \
| grep tag: \
@ -54,15 +54,15 @@ function get_branch_base() {
| cut -f1 -d')'
}
function count_lines() {
function count_lines {
git ls-files | xargs wc -l | tail -n 1 | awk '{print $1}'
}
function count_files() {
function count_files {
git ls-files | wc -l
}
function git_ls_tree() {
function git_ls_tree {
local tag="$1"
local extension="$2"
@ -73,7 +73,7 @@ function git_ls_tree() {
fi
}
function shas_at_tag() {
function shas_at_tag {
# Produce a list of shas used by objects representing files with
# real content at the tag point
local tag="$1"
@ -92,7 +92,7 @@ function shas_at_tag() {
done
}
function count_unchanged_files() {
function count_unchanged_files {
local start="$1"
local end="$2"
local extension="$3"