kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ale...@apache.org
Subject kudu git commit: [jepsen] updated the test script to use gradle
Date Thu, 18 Oct 2018 02:26:37 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 8386ef9e2 -> 7a4caf966


[jepsen] updated the test script to use gradle

Since maven build is gone with commit 8c184e2, it's necessary
to switch from mvn to gradlew while building and running Kudu
Jepsen tests.

In addition, java/kudu-jepsen/README.adoc is updated to reflect
changes made in fbe4312.

Change-Id: If6879c30def3f4c7d8f70945f200ff77275976dc
Reviewed-on: http://gerrit.cloudera.org:8080/11717
Reviewed-by: Grant Henke <granthenke@apache.org>
Tested-by: Kudu Jenkins


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

Branch: refs/heads/master
Commit: 7a4caf9660617c8dad2f95b939adec9eb1f9fd04
Parents: 8386ef9
Author: Alexey Serbin <aserbin@cloudera.com>
Authored: Wed Oct 17 12:21:24 2018 -0700
Committer: Alexey Serbin <aserbin@cloudera.com>
Committed: Thu Oct 18 02:23:41 2018 +0000

----------------------------------------------------------------------
 java/kudu-jepsen/README.adoc | 11 +++++------
 src/kudu/scripts/jepsen.sh   | 20 +++++---------------
 2 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/7a4caf96/java/kudu-jepsen/README.adoc
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/README.adoc b/java/kudu-jepsen/README.adoc
index 562bcdd..2339f9d 100644
--- a/java/kudu-jepsen/README.adoc
+++ b/java/kudu-jepsen/README.adoc
@@ -46,11 +46,10 @@ To build the library the following components are required:
 
 * JDK 8
 
-To build the project and install necessary Java packages into the local Maven
-repository, run in the parent directory (i.e. `$KUDU_HOME/java`)
+To build the project, run in the parent directory (i.e. `$KUDU_HOME/java`)
 [listing]
 ----
-$ ./gradlew -Pjepsen clean install
+$ ./gradlew clean assemble
 ----
 
 === Running
@@ -78,14 +77,14 @@ If using SSH authentication agent to hold the SSH key for DB nodes access,
 run in the current directory:
 [listing]
 ----
-$ ./gradlew -Pjepsen runJepsen -DtserverNodes="t0,t1,t2,t3,t4" -DmasterNodes="m0"
+$ ./gradlew runJepsen -DtserverNodes="t0,t1,t2,t3,t4" -DmasterNodes="m0"
 ----
 
 If not using SSH authentication agent, specify the SSH key location via the
 `sshKeyPath` property:
 [listing]
 ----
-$ ./gradlew -Pjepsen runJepsen -DtserverNodes="t0,t1,t2,t3,t4" -DmasterNodes="m0" -DsshKeyPath="./vm_root_id_rsa"
+$ ./gradlew runJepsen -DtserverNodes="t0,t1,t2,t3,t4" -DmasterNodes="m0" -DsshKeyPath="./vm_root_id_rsa"
 ----
 
 Note that commas (not spaces) are used to separate the names of the nodes. The
@@ -134,7 +133,7 @@ summary message below reports on 10 errors in 10 tests ran:
 21:41:42 Ran 10  tests containing 10 assertions.
 21:41:42 0 failures, 10 errors.
 ----
-To get more details, take a closer look at the output of `./gradlew -Pjepsen runJepsen`
+To get more details, take a closer look at the output of `./gradlew runJepsen`
 or at particular `jepsen.log` files in
 `$KUDU_HOME/java/kudu-jepsen/store/rw-register/<test_timestamp>` directory. A
 quick way to locate the corresponding section in the error log is to search for

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a4caf96/src/kudu/scripts/jepsen.sh
----------------------------------------------------------------------
diff --git a/src/kudu/scripts/jepsen.sh b/src/kudu/scripts/jepsen.sh
index ad3c0eb..870e8dd 100755
--- a/src/kudu/scripts/jepsen.sh
+++ b/src/kudu/scripts/jepsen.sh
@@ -25,15 +25,7 @@
 #   JAVA8_HOME          Default: /usr/lib/jvm/java-8-openjdk-amd64
 #     Path to the JDK8 installation root.  Expecting to find 'java'
 #     in the 'bin' sub-directory.  Java 8 or higher is required for the
-#     maven-clojure-plugin.
-#
-#   M2_HOME             Default: /usr/share/maven
-#     Path to the maven (3.3.6 and newer is required).
-#
-#   MVN_FLAGS           Default: ""
-#     Extra flags which are passed to 'mvn' when building and running Java
-#     tests. This can be useful, for example, to choose a different maven
-#     repository location.
+#     nebula-clojure-plugin.
 #
 #   KUDU_MASTER_NODES   Default: ""
 #     Set of master nodes for the Kudu cluster to run the Jepsen consistency
@@ -72,8 +64,6 @@ NUM_PROCS=$(getconf _NPROCESSORS_ONLN)
 
 BUILD_TYPE=${BUILD_TYPE:-debug}
 JAVA8_HOME=${JAVA8_HOME:-/usr/lib/jvm/java-8-openjdk-amd64}
-M2_HOME=${M2_HOME:-/usr/share/maven}
-MVN_FLAGS=${MVN_FLAGS:-}
 KUDU_MASTER_NODES=${KUDU_MASTER_NODES:-}
 KUDU_TSERVER_NODES=${KUDU_TSERVER_NODES:-}
 SSH_KEY=${SSH_KEY:-}
@@ -116,20 +106,20 @@ $SRC_ROOT/build-support/enable_devtoolset.sh $THIRDPARTY_BIN/cmake \
 make -j$NUM_PROCS 2>&1 | tee build.log
 
 export JAVA_HOME=$JAVA8_HOME
-export PATH=$JAVA_HOME/bin:$M2_HOME/bin:$PATH
+export PATH=$JAVA_HOME/bin:$PATH
 set -x
 
 pushd $SRC_ROOT/java
 echo
-echo "Building Kudu Java packages and installing into local mvn repository"
+echo "Building Kudu Java packages"
 echo "--------------------------------------------------------------------"
-mvn $MVN_FLAGS -Pjepsen -DskipTests clean install
+./gradlew clean assemble
 
 echo
 echo "Building and running kudu-jepsen consistency tests"
 echo "--------------------------------------------------------------------"
 pushd kudu-jepsen
-mvn $MVN_FLAGS clojure:run \
+./gradlew runJepsen \
   -DmasterNodes="$KUDU_MASTER_NODES" \
   -DtserverNodes="$KUDU_TSERVER_NODES" \
   -DsshKeyPath="$SSH_KEY" \


Mime
View raw message