Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add error handling #70

Merged
merged 1 commit into from
Jul 18, 2016
Merged

Add error handling #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ci/docker-rally.sh
View file
Open in desktop
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this variable used to indicate how many tests the CI job fails?

Copy link
Collaborator Author

@mestery mestery Jul 15, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's mainly used to detect if a specific command in docker-rally.sh fails. If run fails, we want to ensure we run cleanup, but we need to remember run failed so we can return that to travis-ci. Make sense?


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 ))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the PR, shall we avoid calling exit in the other script, e.g., https://github.com/openvswitch/ovn-scale-test/blob/master/ci/scale-run.sh#L23

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that should be a return instead of an exit. I will fix it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks


# 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
View file
Open in desktop
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
View file
Open in desktop
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