Skip to content

Commit

Permalink
.ci: Remove travis and add unit testing to Jenkins
Browse files Browse the repository at this point in the history
Unit testing and checkcommits were only run against Travis. Because
we want to rely on only one CI, Jenkins in our case, the solution is
to run both unit testing and checkcommits through Jenkins too.

Fixes clearcontainers#577

Signed-off-by: Sebastien Boeuf <[email protected]>
  • Loading branch information
Sebastien Boeuf committed Sep 20, 2017
1 parent 7fc11d5 commit fb10a0e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 42 deletions.
8 changes: 8 additions & 0 deletions .ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@

set -e

# Make sure root does not own any folder of the GOPATH
# Otherwise this would prevent the following scripts to
# succeed when performing "go get"
sudo chown -R ${USER}:${USER} ${GOPATH}

# Run unit testing
make check

# Current docker tests:
# TODO: Move these docker commands to more formal tests in
# `clearcontainers/tests` repository. See issue:
Expand Down
25 changes: 9 additions & 16 deletions .ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,15 @@ go get "$test_repo"

test_repo_dir="${GOPATH}/src/${test_repo}"

if [ "$TRAVIS" = true ]
then
# Check the commits in the branch
checkcommits_dir="${test_repo_dir}/cmd/checkcommits"
(cd "${checkcommits_dir}" && make)
checkcommits \
--need-fixes \
--need-sign-offs \
--body-length 72 \
--subject-length 75 \
--verbose

# Travis doesn't provide a VT-x environment, so nothing more to do
# here.
exit 0
fi
# Check the commits in the branch
checkcommits_dir="${test_repo_dir}/cmd/checkcommits"
(cd "${checkcommits_dir}" && make)
checkcommits \
--need-fixes \
--need-sign-offs \
--body-length 72 \
--subject-length 75 \
--verbose

# Setup environment and build components.
cd "${test_repo_dir}"
Expand Down
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

0 comments on commit fb10a0e

Please sign in to comment.