subject:"hbase git commit\: HBASE\-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR

[02/26] hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-22 Thread zhangduo

HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6cefabee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6cefabee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6cefabee

Branch: refs/heads/HBASE-19397
Commit: 6cefabee268f8509d7a50c632ff0ff7effcaf685
Parents: 35728ac
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:46:43 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6cefabee/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index fda3299..744e9b0 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
+

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-21 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 bcacdeb21 -> 28cc1fbd6


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/28cc1fbd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/28cc1fbd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/28cc1fbd

Branch: refs/heads/branch-1.1
Commit: 28cc1fbd6c9376ad9dd4695595e84462347971c9
Parents: bcacdeb
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:56:39 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/28cc1fbd/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 94685e4..3070a4d 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" &&

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-21 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/branch-1 0a31209f9 -> 304b20524


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/304b2052
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/304b2052
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/304b2052

Branch: refs/heads/branch-1
Commit: 304b2052460c230c16721d3b564b7e217dfc43b8
Parents: 0a31209
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:55:50 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/304b2052/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 1b2c974..98519df 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" && mkdir

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-21 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 85211b1b5 -> 8f7dbfda1


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8f7dbfda
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8f7dbfda
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8f7dbfda

Branch: refs/heads/branch-1.4
Commit: 8f7dbfda1afdc62dd6ceb3cc249e3bf52857314b
Parents: 85211b1
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:56:04 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8f7dbfda/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 25ccc2f..f06923b 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" &&

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-21 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/branch-2 bf998077b -> a28156be9


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a28156be
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a28156be
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a28156be

Branch: refs/heads/branch-2
Commit: a28156be945f9cb86514287107ebd451ae5309f6
Parents: bf99807
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:55:12 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a28156be/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index fda3299..744e9b0 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" && mkdir

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-21 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/master 35728acd2 -> 6cefabee2


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6cefabee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6cefabee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6cefabee

Branch: refs/heads/master
Commit: 6cefabee268f8509d7a50c632ff0ff7effcaf685
Parents: 35728ac
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Thu Dec 21 10:46:43 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6cefabee/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index fda3299..744e9b0 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" && mkdir

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

2017-12-20 Thread appy

Repository: hbase
Updated Branches:
  refs/heads/HBASE-19571 [created] 1d453e7ab


HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to 
OUTPUT_DIR_RELATIVE.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1d453e7a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1d453e7a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1d453e7a

Branch: refs/heads/HBASE-19571
Commit: 1d453e7ab91ea85cdf3c0fa843104e4092d61fee
Parents: f572c4b
Author: Apekshit Sharma 
Authored: Wed Dec 20 13:27:25 2017 -0800
Committer: Apekshit Sharma 
Committed: Wed Dec 20 22:31:34 2017 -0800

--
 dev-support/Jenkinsfile| 99 +++--
 dev-support/hbase_nightly_yetus.sh | 17 +++---
 2 files changed, 55 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1d453e7a/dev-support/Jenkinsfile
--
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index fda3299..744e9b0 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -34,13 +34,6 @@ pipeline {
 // where we check out to across stages
 BASEDIR = "${env.WORKSPACE}/component"
 YETUS_RELEASE = '0.6.0'
-// where we'll write everything from different steps.
-OUTPUT_RELATIVE_GENERAL = 'output-general'
-OUTPUTDIR_GENERAL = "${env.WORKSPACE}/output-general"
-OUTPUT_RELATIVE_JDK7 = 'output-jdk7'
-OUTPUTDIR_JDK7 = "${env.WORKSPACE}/output-jdk7"
-OUTPUT_RELATIVE_JDK8 = 'output-jdk8'
-OUTPUTDIR_JDK8 = "${env.WORKSPACE}/output-jdk8"
 PROJECT = 'hbase'
 PROJET_PERSONALITY = 
'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh'
 // This section of the docs tells folks not to use the javadoc tag. older 
branches have our old version of the check for said tag.
@@ -123,30 +116,30 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
 // on branches that don't support jdk7, this will already be 
JAVA_HOME, so we'll end up not
 // doing multijdk there.
 MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}"
-OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}"
+OUTPUT_DIR_RELATIVE = "output-general"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
   }
   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"
+  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 should this be a download from master, similar to how the 
personality is?
 sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
   }
   post {
 always {
-  // env variables don't work in archive? or this has to be relative 
to WORKSPACE. :(
-  archive 'output-general/*'
-  archive 'output-general/**/*'
+  // Has to be relative to WORKSPACE.
+  archive "${env.OUTPUT_DIR_RELATIVE}/*"
+  archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
   publishHTML target: [
 allowMissing: true,
 keepAll: true,
 alwaysLinkToLastBuild: true,
-// has to be relative to WORKSPACE :(
-reportDir: 'output-general',
+// Has to be relative to WORKSPACE
+reportDir: "${env.OUTPUT_DIR_RELATIVE}",
 reportFiles: 'console-report.html',
 reportName: 'General Nightly Build Report'
   ]
@@ -159,16 +152,16 @@ curl -L  -o personality.sh "${env.PROJET_PERSONALITY}"
   }
   environment {
 TESTS = 'mvninstall,compile,javac,unit,htmlout'
-OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}"
-OUTPUTDIR = "${env.OUTPUTDIR_JDK7}"
+OUTPUT_DIR_RELATIVE = "output-jdk7"
+OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
 // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
   }
   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"
+  rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
+  rm -rf "${OUTPUT_DIR}/machine" && mkdir

[02/26] hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

hbase git commit: HBASE-19571 Renames OUTPUTDIR to OUTPUT_DIR and OUTPUT_RELATIVE to OUTPUT_DIR_RELATIVE.

7 matches

Site Navigation

Mail list logo

Footer information