You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/09/27 14:59:34 UTC
[1/2] storm git commit: Move system test (VM based integration test)
to another build matrix
Repository: storm
Updated Branches:
refs/heads/master 300569caa -> 1cc4a2412
Move system test (VM based integration test) to another build matrix
* this test adds more and 20 mins in each build and sometimes makes build failing due to long running
* making it to separate build helps reducing build time
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/92df7044
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/92df7044
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/92df7044
Branch: refs/heads/master
Commit: 92df7044846e6f296ecab6282503dd0fac6875e2
Parents: 8e26bc1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 26 10:57:36 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 26 12:41:46 2016 +0900
----------------------------------------------------------------------
.travis.yml | 3 ++-
dev-tools/travis/travis-script.sh | 36 ++++++++++++++++++++--------------
2 files changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/92df7044/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 3aca6a8..d65082f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ addons:
env:
- MODULES=storm-core
- MODULES='!storm-core'
+ - MODULES='INTEGRATION-TEST'
language: java
jdk:
@@ -26,7 +27,7 @@ before_install:
- nvm use 0.12.2
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
script:
- - /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES && /bin/bash ./integration-test/run-it.sh
+ - /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
sudo: true
cache:
directories:
http://git-wip-us.apache.org/repos/asf/storm/blob/92df7044/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index c6625cb..fb13042 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -21,19 +21,25 @@ STORM_SRC_ROOT_DIR=$1
TRAVIS_SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
cd ${STORM_SRC_ROOT_DIR}
+
+if [ "$2" == "INTEGRATION-TEST" ]
+then
+ /bin/bash ./integration-test/run-it.sh
+else
+ # We should be concerned that Travis CI could be very slow because it uses VM
+ export STORM_TEST_TIMEOUT_MS=150000
+ # Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
+ export MAVEN_OPTS="-Xmx1024m"
+
+ mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl "$2"
+ BUILD_RET_VAL=$?
+
+ for dir in `find . -type d -and -wholename \*/target/\*-reports`;
+ do
+ echo "Looking for errors in ${dir}"
+ python ${TRAVIS_SCRIPT_DIR}/print-errors-from-test-reports.py "${dir}"
+ done
+
+ exit ${BUILD_RET_VAL}
+fi
-# We should be concerned that Travis CI could be very slow because it uses VM
-export STORM_TEST_TIMEOUT_MS=150000
-# Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
-export MAVEN_OPTS="-Xmx1024m"
-
-mvn --batch-mode test -fae -Pnative,all-tests -Prat -pl "$2"
-BUILD_RET_VAL=$?
-
-for dir in `find . -type d -and -wholename \*/target/\*-reports`;
-do
- echo "Looking for errors in ${dir}"
- python ${TRAVIS_SCRIPT_DIR}/print-errors-from-test-reports.py "${dir}"
-done
-
-exit ${BUILD_RET_VAL}
[2/2] storm git commit: Merge branch
'move-system-test-to-another-build-matrix' of
https://github.com/HeartSaVioR/storm
Posted by bo...@apache.org.
Merge branch 'move-system-test-to-another-build-matrix' of https://github.com/HeartSaVioR/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1cc4a241
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1cc4a241
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1cc4a241
Branch: refs/heads/master
Commit: 1cc4a2412e6d153bf2f940b94e81f3986edce9bc
Parents: 300569c 92df704
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Sep 27 09:58:54 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Sep 27 09:58:54 2016 -0500
----------------------------------------------------------------------
.travis.yml | 3 ++-
dev-tools/travis/travis-script.sh | 36 ++++++++++++++++++++--------------
2 files changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------