subject:"\[3\/4\] hbase git commit\: HBASE\-20335 ensure each stage of the nightly job gathers machine information."

[3/4] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.

2018-04-13 Thread busbey

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/1f2dbe14
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f2dbe14
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f2dbe14

Branch: refs/heads/branch-1.3
Commit: 1f2dbe14e3b16363ea63351f308260529f7fb8d0
Parents: 1c8246c
Author: Sean Busbey 
Authored: Wed Apr 11 10:38:12 2018 -0500
Committer: Sean Busbey 
Committed: Fri Apr 13 23:19:50 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/1f2dbe14/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/1f2dbe14/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

[3/4] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.

2018-04-13 Thread busbey

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/41762373
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/41762373
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/41762373

Branch: refs/heads/branch-2.0
Commit: 417623736ff676b151a2b37f4a8107d1ce4872df
Parents: 7704d3b
Author: Sean Busbey 
Authored: Wed Apr 11 10:38:12 2018 -0500
Committer: Sean Busbey 
Committed: Fri Apr 13 23:16:29 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/41762373/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 6acd4b2..56d53d8 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/41762373/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

[3/4] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.

[3/4] hbase git commit: HBASE-20335 ensure each stage of the nightly job gathers machine information.

2 matches

Site Navigation

Mail list logo

Footer information