diff --git a/Makefile b/Makefile index b13bb99ce..67ad33f05 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ CMAKE=cmake MAKE_OPTIONS= QFSTEST_OPTIONS= JAVA_BUILD_OPTIONS= -QFSHADOOP_VERSIONS=0.23.11 1.0.4 1.1.2 2.5.1 2.7.2 2.7.7 2.8.5 2.9.2 2.10.1 3.1.4 3.2.2 3.3.1 +QFSHADOOP_VERSIONS=0.23.11 1.0.4 1.1.2 2.5.1 2.7.2 2.7.7 2.8.5 2.9.2 2.10.2 3.3.6 3.4.1 QFS_PYTHON_DIR=python-qfs QFS_PYTHON_WHEEL_DIR=${QFS_PYTHON_DIR}/dist @@ -49,7 +49,7 @@ run-cmake: dir build: run-cmake cd build/${BUILD_TYPE} && $(MAKE) ${MAKE_OPTIONS} install \ `${QFS_MSTRESS_ON} && \ - echo ${QFSHADOOP_VERSIONS} | grep 2.10.1 >/dev/null 2>&1 && \ + echo ${QFSHADOOP_VERSIONS} | grep 2.10.2 >/dev/null 2>&1 && \ mvn --version >/dev/null 2>&1 && echo mstress-tarball` .PHONY: java diff --git a/benchmarks/mstress/CMakeLists.txt b/benchmarks/mstress/CMakeLists.txt index 2b5210a0c..acb6f21b4 100644 --- a/benchmarks/mstress/CMakeLists.txt +++ b/benchmarks/mstress/CMakeLists.txt @@ -36,7 +36,7 @@ add_custom_command( -v ${CMAKE_CURRENT_SOURCE_DIR}/../../src/cc/common/buildversgit.sh -- -DbuildDirectory=${CMAKE_CURRENT_BINARY_DIR} - -Dhadoop.release.version=2.10.1 + -Dhadoop.release.version=2.10.2 package DEPENDS src/main/java/com/quantcast/qfs/mstress/MStress_Client.java pom.xml COMMENT "The HDFS mstress client bundled as a jar." diff --git a/benchmarks/mstress/pom.xml b/benchmarks/mstress/pom.xml index 444f1fbb0..9ad720bb6 100644 --- a/benchmarks/mstress/pom.xml +++ b/benchmarks/mstress/pom.xml @@ -33,7 +33,7 @@ permissions and limitations under the License. UTF-8 ${project.basedir}/../../build/java/mstress - 2.10.1 + 2.10.2 00000000 0 diff --git a/travis/script.sh b/travis/script.sh index 6f89d782d..8d5278d16 100755 --- a/travis/script.sh +++ b/travis/script.sh @@ -67,7 +67,7 @@ MYCMAKE_OPTIONS_CENTOS5=$MYCMAKE_OPTIONS' -D _OPENSSL_INCLUDEDIR=/usr/include/op MYCMAKE_OPTIONS_CENTOS5=$MYCMAKE_OPTIONS_CENTOS5' -D _OPENSSL_LIBDIR=/usr/lib64/openssl101e' MYQFSHADOOP_VERSIONS_UBUNTU1404_CENTOS6='0.23.4 0.23.11 1.0.4 1.1.2 2.5.1 2.7.2' -MYQFSHADOOP_VERSIONS_UBUNTU1804='1.0.4 1.1.2 2.7.2 2.7.7 2.8.5 2.9.2 2.10.1 3.1.4 3.2.2 3.3.1' +MYQFSHADOOP_VERSIONS_UBUNTU1804='1.0.4 1.1.2 2.7.2 2.7.7 2.8.5 2.9.2 2.10.2 3.3.6 3.4.1' MYQFSHADOOP_VERSIONS_CENTOS2023=$MYQFSHADOOP_VERSIONS_UBUNTU1804 MYQFSHADOOP_VERSIONS_CENTOS5='0.23.4 0.23.11 1.0.4 1.1.2 2.5.1'