You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/04/11 06:32:29 UTC
[01/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Repository: hbase
Updated Branches:
refs/heads/branch-1 427c95e2e -> ff3e56293
refs/heads/branch-1.2 c20214459 -> 1ea3a8bc8
refs/heads/branch-1.3 1197ecaa3 -> fe8bd3ff0
refs/heads/branch-1.4 65a51fa28 -> a5c456de9
refs/heads/branch-2 37227b6bb -> 9bf087d28
refs/heads/branch-2.0 011dd2dae -> 388764805
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1ef2450c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ef2450c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ef2450c
Branch: refs/heads/branch-2
Commit: 1ef2450ca9a8f1e9e285799455a36ca5622ea511
Parents: 37227b6
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:30:46 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1ef2450c/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index d34f761..90786f2 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -277,8 +277,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -352,8 +354,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -459,8 +463,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -473,8 +479,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0
[04/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/38876480
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/38876480
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/38876480
Branch: refs/heads/branch-2.0
Commit: 3887648057e30fbaad95395aba433184d41d5fd4
Parents: 86f4686
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:30:56 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/38876480/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index c91a2b1..238d0e6 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/38876480/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[06/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ff3e5629
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff3e5629
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff3e5629
Branch: refs/heads/branch-1
Commit: ff3e56293966f2eb8c5124b22689287ccf2c3d69
Parents: 358d451
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:05 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff3e5629/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index bb1da7a..a8356b4 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/ff3e5629/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[02/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9bf087d2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9bf087d2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9bf087d2
Branch: refs/heads/branch-2
Commit: 9bf087d28b599020ff2825107cd6bca8df609a38
Parents: 1ef2450
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:30:49 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9bf087d2/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index c91a2b1..238d0e6 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/9bf087d2/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[07/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Posted by bu...@apache.org.
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a5b1c940
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a5b1c940
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a5b1c940
Branch: refs/heads/branch-1.4
Commit: a5b1c940961b8c894cfcfe14db8b194718e12fde
Parents: 65a51fa
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:09 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5b1c940/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 9664095..819beee 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -277,8 +277,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -352,8 +354,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -459,8 +463,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -473,8 +479,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0
[05/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Posted by bu...@apache.org.
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/358d451d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/358d451d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/358d451d
Branch: refs/heads/branch-1
Commit: 358d451d96ae174d40525a54914e8e61af2a38e3
Parents: 427c95e
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:02 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/358d451d/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 9664095..819beee 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -277,8 +277,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -352,8 +354,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -459,8 +463,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -473,8 +479,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0
[08/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a5c456de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a5c456de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a5c456de
Branch: refs/heads/branch-1.4
Commit: a5c456de9c31074232c20bc92e2d34880ef12051
Parents: a5b1c94
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:12 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5c456de/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index bb1da7a..a8356b4 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/a5c456de/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[11/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Posted by bu...@apache.org.
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a69e879c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a69e879c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a69e879c
Branch: refs/heads/branch-1.2
Commit: a69e879c6972ef7a955835a7951e422345034292
Parents: c202144
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:25 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a69e879c/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 23a834c..19e7e97 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -273,8 +273,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -348,8 +350,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -455,8 +459,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -469,8 +475,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0
[12/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1ea3a8bc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ea3a8bc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ea3a8bc
Branch: refs/heads/branch-1.2
Commit: 1ea3a8bc86a4132cb3f5df85c60e939ca9c77a92
Parents: a69e879
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:28 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1ea3a8bc/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index eeeda83..ffd8c18 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/1ea3a8bc/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[09/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Posted by bu...@apache.org.
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dfc264a6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dfc264a6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dfc264a6
Branch: refs/heads/branch-1.3
Commit: dfc264a6a7fd0c3a5e9d11680ed9dd6d710ca0ea
Parents: 1197eca
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:17 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/dfc264a6/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 23a834c..19e7e97 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -273,8 +273,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -348,8 +350,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -455,8 +459,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -469,8 +475,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0
[10/12] hbase git commit: HBASE-20335 nightly job bash cleanup.
Posted by bu...@apache.org.
HBASE-20335 nightly job bash cleanup.
* Ensure Jenkins steps that invoke bash inline set -e
* machine stats script should check that passed directory will work
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fe8bd3ff
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe8bd3ff
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe8bd3ff
Branch: refs/heads/branch-1.3
Commit: fe8bd3ff0bc7d871b71050a110fe539a8b8f487b
Parents: dfc264a
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Apr 3 12:08:05 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:31:20 2018 -0500
----------------------------------------------------------------------
dev-support/Jenkinsfile | 11 +++++++++++
dev-support/gather_machine_environment.sh | 5 +++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fe8bd3ff/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index bb1da7a..a8356b4 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
stage ('yetus install') {
steps {
sh '''#!/usr/bin/env bash
+set -e
echo "Ensure we have a copy of Apache Yetus."
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_DIR="${WORKSPACE}/yetus-${YETUS_RELEASE}"
@@ -101,6 +102,7 @@ fi
// Set up the file we need at PERSONALITY_FILE location
dir ("tools") {
sh """#!/usr/bin/env bash
+set -e
echo "Downloading Project personality."
curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
"""
@@ -144,12 +146,14 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
// TODO roll this into the hbase_nightly_yetus script
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -202,11 +206,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -273,11 +279,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -351,11 +359,13 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
'''
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "${OUTPUT_DIR}/commentfile}"
declare -i status=0
if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -425,6 +435,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}"
checkout scm
}
sh '''#!/usr/bin/env bash
+ set -e
rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
'''
http://git-wip-us.apache.org/repos/asf/hbase/blob/fe8bd3ff/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 589dffe..fa99d3f 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -33,6 +33,11 @@ fi
declare output=$1
+if [ ! -d "${output}" ] || [ ! -w "${output}" ]; then
+ echo "Specified output directory must exist and be writable." >&2
+ exit 1
+fi
+
echo "getting machine specs, find in ${BUILD_URL}/artifact/${output}/"
echo "JAVA_HOME: ${JAVA_HOME}" >"${output}/java_home" 2>&1 || true
ls -l "${JAVA_HOME}" >"${output}/java_home_ls" 2>&1 || true
[03/12] hbase git commit: HBASE-20068 personality tests for Apache
Yetus should use the maven plugin to exec maven.
Posted by bu...@apache.org.
HBASE-20068 personality tests for Apache Yetus should use the maven plugin to exec maven.
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Reid Chan <re...@outlook.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/86f4686b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/86f4686b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/86f4686b
Branch: refs/heads/branch-2.0
Commit: 86f4686bc655590cfd1d20d19ce640a07475c2f0
Parents: 011dd2d
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Apr 8 21:27:58 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Apr 11 01:30:53 2018 -0500
----------------------------------------------------------------------
dev-support/hbase-personality.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/86f4686b/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index d34f761..90786f2 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -277,8 +277,10 @@ function refguide_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean site --batch-mode \
+ $(maven_executor) clean site --batch-mode \
-pl . \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -352,8 +354,10 @@ function shadedjars_rebuild
start_clock
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \
+ $(maven_executor) clean verify -fae --batch-mode \
-pl hbase-shaded/hbase-shaded-check-invariants -am \
-Dtest=NoUnitTests -DHBasePatchProcess -Prelease \
-Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true
@@ -459,8 +463,10 @@ function hadoopcheck_rebuild
export MAVEN_OPTS="${MAVEN_OPTS}"
for hadoopver in ${hbase_hadoop2_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-two.version="${hadoopver}"
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
@@ -473,8 +479,10 @@ function hadoopcheck_rebuild
for hadoopver in ${hbase_hadoop3_versions}; do
logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
+ # disabled because "maven_executor" needs to return both command and args
+ # shellcheck disable=2046
echo_and_redirect "${logfile}" \
- "${MAVEN}" clean install \
+ $(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
-Dhadoop.profile=3.0