Skip to content

Commit

Permalink
Add error handling
Browse files Browse the repository at this point in the history
Add some initial error handling into the CI scripts

Closes Issue ovn-org#69

Signed-off-by: Kyle Mestery <mestery@mestery.com>
  • Loading branch information
mestery committed Jul 15, 2016
1 parent e5742dd commit 3a2272f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions ci/docker-rally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
XTRACE=$(set +o | grep xtrace)
set -o xtrace

# Track failures
FAILED=0

OVS_REPO=${1:-https://github.com/openvswitch/ovs.git}
OVS_BRANCH=${2:-master}

Expand All @@ -12,13 +15,15 @@ echo "OVS_REPO=${OVS_REPO} OVS_BRANCH=${OVS_BRANCH}"
# A combined script to run all the things

# Prepare the environment
./prepare.sh
./prepare.sh || FAILED=$(( $FAILED + 1 ))

# Run the testsuite
./scale-run.sh $OVS_REPO $OVS_BRANCH
./scale-run.sh $OVS_REPO $OVS_BRANCH || FAILED=$(( $FAILED + 1 ))

# Clean things up
./scale-cleanup.sh
./scale-cleanup.sh || FAILED=$(( $FAILED + 1 ))

return $FAILED

# Restore xtrace
$XTRACE
2 changes: 1 addition & 1 deletion ci/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ if [ "$INSTALLDOCKER" == "True" ] ; then
if [ "$OVNSUDO" == "" ] ; then
echo "WARNING: The docker group was created and the $OVNUSER user added to this group."
echo " Please reboot the box, log back in, and re-run $0."
exit 1
return 1
fi
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions ci/scale-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function check_container_failure {
for failed in ${failed_containers}; do
docker logs --tail all ${failed}
done
exit 1
return 1
fi
}

Expand All @@ -40,7 +40,7 @@ $OVNSUDO /usr/local/bin/ansible-playbook -i $OVN_DOCKER_HOSTS ansible/site.yml -
--extra-vars "ovs_repo=$OVS_REPO" --extra-vars "ovs_branch=$OVS_BRANCH" -e action=deploy
if [ "$?" != "0" ] ; then
echo "Deploying failed, exiting"
exit 1
return 1
fi
popd

Expand Down

0 comments on commit 3a2272f

Please sign in to comment.