[1/2] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.
Repository: hbase Updated Branches: refs/heads/master 73275f177 -> 7b7ab HBASE-20335 ensure each stage of the nightly job gathers machine information. * fix archiving for src tarball stage's machine info * stop nightly wrapper desroying the output dir. Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f695ecb2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f695ecb2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f695ecb2 Branch: refs/heads/master Commit: f695ecb2db2ec1a816613225a365b787175e2462 Parents: 73275f1 Author: Sean Busbey Authored: Wed Apr 11 10:38:12 2018 -0500 Committer: Sean Busbey Committed: Fri Apr 13 22:42:37 2018 -0500 -- dev-support/Jenkinsfile| 11 +++ dev-support/hbase_nightly_yetus.sh | 7 +-- 2 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f695ecb2/dev-support/Jenkinsfile -- diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index b289eaf..f9e1d72 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -150,6 +150,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' // TODO roll this into the hbase_nightly_yetus script sh '''#!/usr/bin/env bash @@ -210,6 +212,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -283,6 +287,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -363,6 +369,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -437,6 +445,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" set -e rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine" "${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine" + echo "got the following saved stats in 'output-srctarball/machine'" + ls -lh "output-srctarball/machine" ''' sh """#!/bin/bash -e if "${env.BASEDIR}/dev-support/hbase_nightly_source-artifact.sh" \ @@ -456,6 +466,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" always { stash name: 'srctarball-result', includes: "output-srctarball/commentfile" archive 'output-srctarball/*' + archive 'output-srctarball/**/*' } } } http://git-wip-us.apache.org/repos/asf/hbase/blob/f695ecb2/dev-support/hbase_nightly_yetus.sh -- diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh index 4e0200d..bba5f4d 100755 --- a/dev-support/hbase_nightly_yetus.sh +++ b/dev-support/hbase_nightly_yetus.sh @@ -91,8 +91,11 @@ if [[ true == "${DEBUG}" ]]; then YETUS_ARGS=("--debug" "${YETUS_ARGS[@]}") fi -rm -rf "${OUTPUT_DIR}" -mkdir -p "${OUTPUT_DIR}" +if [[ ! -d "${OUTPUT_DIR}" ]]; then + echo "[ERROR] the specified
[1/2] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.
Repository: hbase Updated Branches: refs/heads/HBASE-20335 [created] 215809392 refs/heads/HBASE-20355 [deleted] 4d9250684 HBASE-20335 ensure each stage of the nightly job gathers machine information. * fix archiving for src tarball stage's machine info * stop nightly wrapper desroying the output dir. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/21580939 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/21580939 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/21580939 Branch: refs/heads/HBASE-20335 Commit: 215809392eef9e0310b8ceaef9de49ddd7718492 Parents: 0aab603 Author: Sean Busbey Authored: Wed Apr 11 10:38:12 2018 -0500 Committer: Sean Busbey Committed: Thu Apr 12 12:19:41 2018 -0500 -- dev-support/Jenkinsfile| 11 +++ dev-support/hbase_nightly_yetus.sh | 7 +-- 2 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/21580939/dev-support/Jenkinsfile -- diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 4f34eab..f05523a 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -150,6 +150,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' // TODO roll this into the hbase_nightly_yetus script sh '''#!/usr/bin/env bash @@ -210,6 +212,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -283,6 +287,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -363,6 +369,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" 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" + echo "got the following saved stats in '${OUTPUT_DIR_RELATIVE}/machine'" + ls -lh "${OUTPUT_DIR_RELATIVE}/machine" ''' sh '''#!/usr/bin/env bash set -e @@ -438,6 +446,8 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" set -e rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine" "${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine" + echo "got the following saved stats in 'output-srctarball/machine'" + ls -lh "output-srctarball/machine" ''' sh """#!/bin/bash -e if "${env.BASEDIR}/dev-support/hbase_nightly_source-artifact.sh" \ @@ -457,6 +467,7 @@ curl -L -o personality.sh "${env.PROJECT_PERSONALITY}" always { stash name: 'srctarball-result', includes: "output-srctarball/commentfile" archive 'output-srctarball/*' + archive 'output-srctarball/**/*' } } } http://git-wip-us.apache.org/repos/asf/hbase/blob/21580939/dev-support/hbase_nightly_yetus.sh -- diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh index 4e0200d..bba5f4d 100755 --- a/dev-support/hbase_nightly_yetus.sh +++ b/dev-support/hbase_nightly_yetus.sh @@ -91,8 +91,11 @@ if [[ true == "${DEBUG}" ]]; then YETUS_ARGS=("--debug" "${YETUS_ARGS[@]}") fi -rm -rf "${OUTPUT_DIR}" -mkdir -p "${OUTPUT_DIR}" +if [[ ! -d "${OUTPUT_DIR}" ]]; then + echo "