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 2017/11/09 21:09:53 UTC

[04/12] hbase git commit: HBASE-19228 nightly job should gather machine stats.

HBASE-19228 nightly job should gather machine stats.

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

Branch: refs/heads/branch-1
Commit: a7447e015d998eff76ebacd25d646cc74661ea54
Parents: 17ac004
Author: Sean Busbey <bu...@apache.org>
Authored: Thu Nov 9 09:29:26 2017 -0600
Committer: Sean Busbey <bu...@apache.org>
Committed: Thu Nov 9 15:08:18 2017 -0600

----------------------------------------------------------------------
 dev-support/Jenkinsfile                   | 19 +++++++++++++++++++
 dev-support/gather_machine_environment.sh |  1 +
 2 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a7447e01/dev-support/Jenkinsfile
----------------------------------------------------------------------
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 48e2249..f9c9159 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -127,6 +127,11 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
       }
       steps {
         unstash 'yetus'
+        sh '''#!/usr/bin/env bash
+          rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}"
+          rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine"
+          "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/machine"
+'''
         // TODO should this be a download from master, similar to how the personality is?
         sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
       }
@@ -159,6 +164,11 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
       }
       steps {
         unstash 'yetus'
+        sh '''#!/usr/bin/env bash
+          rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}"
+          rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine"
+          "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/machine"
+'''
         sh """#!/usr/bin/env bash
           # for branch-1.1 we don't do jdk8 findbugs, so do it here
           if [ "${env.BRANCH_NAME}" == "branch-1.1" ]; then
@@ -215,6 +225,11 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
       }
       steps {
         unstash 'yetus'
+        sh '''#!/usr/bin/env bash
+          rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}"
+          rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine"
+          "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/machine"
+'''
         sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
       }
       post {
@@ -265,6 +280,10 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
           rm -rf ".m2-for-repo" && mkdir ".m2-for-repo"
           rm -rf ".m2-for-src" && mkdir ".m2-for-src"
 '''
+        sh '''#!/usr/bin/env bash
+          rm -rf "output-srctarball/machine" && mkdir "output-srctarball/machine"
+          "${BASEDIR}/dev-support/gather_machine_environment.sh" "output-srctarball/machine"
+'''
         sh """#!/bin/bash -e
           ${env.BASEDIR}/dev-support/hbase_nightly_source-artifact.sh \
               --intermediate-file-dir output-srctarball \

http://git-wip-us.apache.org/repos/asf/hbase/blob/a7447e01/dev-support/gather_machine_environment.sh
----------------------------------------------------------------------
diff --git a/dev-support/gather_machine_environment.sh b/dev-support/gather_machine_environment.sh
index 8f2c74e..589dffe 100755
--- a/dev-support/gather_machine_environment.sh
+++ b/dev-support/gather_machine_environment.sh
@@ -48,3 +48,4 @@ ifconfig -a >"${output}/ifconfig-a" 2>&1 || true
 lsblk -ta >"${output}/lsblk-ta" 2>&1 || true
 lsblk -fa >"${output}/lsblk-fa" 2>&1 || true
 ulimit -l >"${output}/ulimit-l" 2>&1 || true
+uptime >"${output}/uptime" 2>&1 || true