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 <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/8a3e1c30 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8a3e1c30 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8a3e1c30 Branch: refs/heads/branch-1.4 Commit: 8a3e1c30b4d6ec07d7a3e396be49e7f507632ce0 Parents: e1ab70d Author: Sean Busbey <bus...@apache.org> Authored: Wed Apr 11 10:38:12 2018 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Fri Apr 13 23:19:22 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/8a3e1c30/dev-support/Jenkinsfile ---------------------------------------------------------------------- diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 443dd20..2adaeba 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/8a3e1c30/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 output directory must already exist: '${OUTPUT_DIR}'" + exit 1 +fi + if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/shelldocs" "${YETUS_ARGS[@]}") TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch"