Add toggle for skipping tests

This commit is contained in:
Adam Harrison committed 2016-09-29 11:35:01 +01:00
1 parent b45f138ff1
commit a9db631836
6 files changed
+44 -29

No files matched your search

+12 -7
View File
@@ -2,16 +2,21 @@
set -e
echo "SKIP_TESTS=1" > "$STATE"
source "$STATE"
sudo apt-get -q update && sudo apt-get -q install bc jq
bin/setup-circleci-secrets "$SECRET_PASSWORD"
mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR
cd $SRCDIR; git submodule update --init
if [ "$CIRCLE_NODE_INDEX" = "0" ] ; then
cd $SRCDIR/test; ./gce.sh make_template
if [ -z "$SKIP_TESTS" ] ; then
cd $SRCDIR; git submodule update --init
if [ "$CIRCLE_NODE_INDEX" = "0" ] ; then
cd $SRCDIR/test; ./gce.sh make_template
fi
cd $SRCDIR/build
../tools/rebuild-image weaveworks/weavebuild . Dockerfile build.sh
touch $SRCDIR/.build.uptodate
sudo chown -R ubuntu /usr/local/go
fi
cd $SRCDIR/build
../tools/rebuild-image weaveworks/weavebuild . Dockerfile build.sh
touch $SRCDIR/.build.uptodate
sudo chown -R ubuntu /usr/local/go
+6 -4
View File
@@ -4,10 +4,12 @@ set -e
source "$STATE"
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
cd $SRCDIR
make clean-bin
make publish
if [ -z "$SKIP_TESTS" ] ; then
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
cd $SRCDIR
make clean-bin
make publish
fi
go get github.com/weaveworks/wordepress
cd /home/ubuntu/src/github.com/weaveworks/wordepress
+6 -4
View File
@@ -4,8 +4,10 @@ set -e
source "$STATE"
if [ "$CIRCLE_NODE_INDEX" = "0" ] ; then
go get github.com/mattn/goveralls
goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/test/profile.cov -service=circleci
cd $SRCDIR/test; cp coverage.* $CIRCLE_ARTIFACTS
if [ -z "$SKIP_TESTS" ] ; then
if [ "$CIRCLE_NODE_INDEX" = "0" ] ; then
go get github.com/mattn/goveralls
goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/test/profile.cov -service=circleci
cd $SRCDIR/test; cp coverage.* $CIRCLE_ARTIFACTS
fi
fi
+6 -4
View File
@@ -4,7 +4,9 @@ set -e
source "$STATE"
cd $SRCDIR/test
eval $(./gce.sh hosts)
export COVERAGE=true
./run_all.sh
if [ -z "$SKIP_TESTS" ] ; then
cd $SRCDIR/test
eval $(./gce.sh hosts)
export COVERAGE=true
./run_all.sh
fi
+5 -3
View File
@@ -4,6 +4,8 @@ set -e
source "$STATE"
cd $SRCDIR/test
./gce.sh destroy
test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh)
if [ -z "$SKIP_TESTS" ] ; then
cd $SRCDIR/test
./gce.sh destroy
test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh)
fi
+9 -7
View File
@@ -4,11 +4,13 @@ set -e
source "$STATE"
cd $SRCDIR
make lint
COVERDIR=test/coverage make RM= tests
make COVERAGE=true RM= all
make testrunner
if [ -z "$SKIP_TESTS" ] ; then
cd $SRCDIR
make lint
COVERDIR=test/coverage make RM= tests
make COVERAGE=true RM= all
make testrunner
cd $SRCDIR/test
./gce.sh setup && eval $(./gce.sh hosts) && ./setup.sh
cd $SRCDIR/test
./gce.sh setup && eval $(./gce.sh hosts) && ./setup.sh
fi