kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [4/4] incubator-kudu git commit: build-and-test.sh: prevent Jenkins from archiving old Java test artifacts
Date Tue, 03 May 2016 00:17:41 GMT
build-and-test.sh: prevent Jenkins from archiving old Java test artifacts

I saw a LINT gerrit precommit test run that archived Java test logs from a
completely different build that must have run before on the same slave. This
is addressed for the C++ tests when we rm -rf $BUILD_ROOT, but
unfortunately, Java test artifacts live outside $BUILD_ROOT.

I also removed a workaround that we should no longer need.

Change-Id: Iaf96379d45957b1208329ae42317c6019b9e08b4
Reviewed-on: http://gerrit.cloudera.org:8080/2931
Tested-by: Adar Dembo <adar@cloudera.com>
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/95eb5d59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/95eb5d59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/95eb5d59

Branch: refs/heads/master
Commit: 95eb5d59141f0591222cce1353c5ebcf4297286b
Parents: 4090087
Author: Adar Dembo <adar@cloudera.com>
Authored: Mon May 2 23:47:41 2016 +0200
Committer: Todd Lipcon <todd@apache.org>
Committed: Tue May 3 00:17:20 2016 +0000

----------------------------------------------------------------------
 build-support/jenkins/build-and-test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/95eb5d59/build-support/jenkins/build-and-test.sh
----------------------------------------------------------------------
diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh
index 91eaca5..71b5a49 100755
--- a/build-support/jenkins/build-and-test.sh
+++ b/build-support/jenkins/build-and-test.sh
@@ -153,11 +153,6 @@ else
   CLANG=$(pwd)/thirdparty/clang-toolchain/bin/clang
 fi
 
-# Before running cmake below, clean out any errant cmake state from the source
-# tree. We need this to help transition into a world where out-of-tree builds
-# are required. Once that's done, the cleanup can be removed.
-rm -rf $SOURCE_ROOT/CMakeCache.txt $SOURCE_ROOT/CMakeFiles
-
 # Configure the build
 #
 # ASAN/TSAN can't build the Python bindings because the exported Kudu client
@@ -317,6 +312,11 @@ if [ "$BUILD_JAVA" == "1" ]; then
   echo
   echo Building and testing java...
   echo ------------------------------------------------------------
+
+  # Remove testing artifacts from the previous run.
+  rm -rf $SOURCE_ROOT/java/*/target/surefire-reports
+  rm -rf $SOURCE_ROOT/java/*/target/testdata
+
   # Make sure we use JDK7
   export JAVA_HOME=$JAVA7_HOME
   export PATH=$JAVA_HOME/bin:$PATH


Mime
View raw message