Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Apekshit Sharma 2017-12-20 13:27:25 -08:00
parent bf998077b9
commit a28156be94
2 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
dev-support/Jenkinsfile vendored
View File

@ -34,13 +34,6 @@ pipeline {
// where we check out to across stages // where we check out to across stages
BASEDIR = "${env.WORKSPACE}/component" BASEDIR = "${env.WORKSPACE}/component"
YETUS_RELEASE = '0.6.0' 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' PROJECT = 'hbase'
PROJET_PERSONALITY = 'https://raw.githubusercontent.com/apache/hbase/master/dev-support/hbase-personality.sh' 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. // 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 // on branches that don't support jdk7, this will already be JAVA_HOME, so we'll end up not
// doing multijdk there. // doing multijdk there.
MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64' MULTIJDK = '/usr/lib/jvm/java-8-openjdk-amd64'
OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_GENERAL}" OUTPUT_DIR_RELATIVE = "output-general"
OUTPUTDIR = "${env.OUTPUTDIR_GENERAL}" OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
} }
steps { steps {
unstash 'yetus' unstash 'yetus'
sh '''#!/usr/bin/env bash sh '''#!/usr/bin/env bash
rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}" rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine" rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/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? // TODO should this be a download from master, similar to how the personality is?
sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh" sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
} }
post { post {
always { always {
// env variables don't work in archive? or this has to be relative to WORKSPACE. :( // Has to be relative to WORKSPACE.
archive 'output-general/*' archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive 'output-general/**/*' archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [ publishHTML target: [
allowMissing: true, allowMissing: true,
keepAll: true, keepAll: true,
alwaysLinkToLastBuild: true, alwaysLinkToLastBuild: true,
// has to be relative to WORKSPACE :( // Has to be relative to WORKSPACE
reportDir: 'output-general', reportDir: "${env.OUTPUT_DIR_RELATIVE}",
reportFiles: 'console-report.html', reportFiles: 'console-report.html',
reportName: 'General Nightly Build Report' reportName: 'General Nightly Build Report'
] ]
@ -159,16 +152,16 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
} }
environment { environment {
TESTS = 'mvninstall,compile,javac,unit,htmlout' TESTS = 'mvninstall,compile,javac,unit,htmlout'
OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK7}" OUTPUT_DIR_RELATIVE = "output-jdk7"
OUTPUTDIR = "${env.OUTPUTDIR_JDK7}" OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
// On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already. // On branches where we do jdk7 checks, jdk7 will be JAVA_HOME already.
} }
steps { steps {
unstash 'yetus' unstash 'yetus'
sh '''#!/usr/bin/env bash sh '''#!/usr/bin/env bash
rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}" rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine" rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/machine" "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
''' '''
sh """#!/usr/bin/env bash sh """#!/usr/bin/env bash
# for branch-1.1 we don't do jdk8 findbugs, so do it here # for branch-1.1 we don't do jdk8 findbugs, so do it here
@ -180,14 +173,14 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
} }
post { post {
always { always {
junit testResults: 'output-jdk7/**/target/**/TEST-*.xml', allowEmptyResults: true junit testResults: "${env.OUTPUT_DIR_RELATIVE}/**/target/**/TEST-*.xml", allowEmptyResults: true
// zip surefire reports. // zip surefire reports.
sh '''#!/bin/bash -e sh '''#!/bin/bash -e
if [ -d "${OUTPUTDIR}/archiver" ]; then if [ -d "${OUTPUT_DIR}/archiver" ]; then
count=$(find "${OUTPUTDIR}/archiver" -type f | wc -l) count=$(find "${OUTPUT_DIR}/archiver" -type f | wc -l)
if [[ 0 -ne ${count} ]]; then if [[ 0 -ne ${count} ]]; then
echo "zipping ${count} archived files" echo "zipping ${count} archived files"
zip -q -m -r "${OUTPUTDIR}/test_logs.zip" "${OUTPUTDIR}/archiver" zip -q -m -r "${OUTPUT_DIR}/test_logs.zip" "${OUTPUT_DIR}/archiver"
else else
echo "No archived files, skipping compressing." echo "No archived files, skipping compressing."
fi fi
@ -195,17 +188,17 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
echo "No archiver directory, skipping compressing." echo "No archiver directory, skipping compressing."
fi fi
''' '''
// env variables don't work in archive? or this has to be relative to WORKSPACE. :( // Has to be relative to WORKSPACE.
archive 'output-jdk7/*' archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive 'output-jdk7/**/*' archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [ publishHTML target: [
allowMissing: true, allowMissing : true,
keepAll: true, keepAll : true,
alwaysLinkToLastBuild: true, alwaysLinkToLastBuild: true,
// has to be relative to WORKSPACE :( // Has to be relative to WORKSPACE.
reportDir: 'output-jdk7', reportDir : "${env.OUTPUT_DIR_RELATIVE}",
reportFiles: 'console-report.html', reportFiles : 'console-report.html',
reportName: 'JDK7 Nightly Build Report' reportName : 'JDK7 Nightly Build Report'
] ]
} }
} }
@ -218,8 +211,8 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
} }
environment { environment {
TESTS = 'mvninstall,compile,javac,unit,findbugs,htmlout' TESTS = 'mvninstall,compile,javac,unit,findbugs,htmlout'
OUTPUT_RELATIVE = "${env.OUTPUT_RELATIVE_JDK8}" OUTPUT_DIR_RELATIVE = "output-jdk8"
OUTPUTDIR = "${env.OUTPUTDIR_JDK8}" OUTPUT_DIR = "${env.WORKSPACE}/${env.OUTPUT_DIR_RELATIVE}"
// This isn't strictly needed on branches that only support jdk8, but doesn't hurt // This isn't strictly needed on branches that only support jdk8, but doesn't hurt
// and is needed on branches that do both jdk7 and jdk8 // and is needed on branches that do both jdk7 and jdk8
SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64' SET_JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64'
@ -227,22 +220,22 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
steps { steps {
unstash 'yetus' unstash 'yetus'
sh '''#!/usr/bin/env bash sh '''#!/usr/bin/env bash
rm -rf "${OUTPUTDIR}" && mkdir "${OUTPUTDIR}" rm -rf "${OUTPUT_DIR}" && mkdir "${OUTPUT_DIR}"
rm -rf "${OUTPUTDIR}/machine" && mkdir "${OUTPUTDIR}/machine" rm -rf "${OUTPUT_DIR}/machine" && mkdir "${OUTPUT_DIR}/machine"
"${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_RELATIVE}/machine" "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
''' '''
sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh" sh "${env.BASEDIR}/dev-support/hbase_nightly_yetus.sh"
} }
post { post {
always { always {
junit testResults: 'output-jdk8/**/target/**/TEST-*.xml', allowEmptyResults: true junit testResults: "${env.OUTPUT_DIR_RELATIVE}/**/target/**/TEST-*.xml", allowEmptyResults: true
// zip surefire reports. // zip surefire reports.
sh '''#!/bin/bash -e sh '''#!/bin/bash -e
if [ -d "${OUTPUTDIR}/archiver" ]; then if [ -d "${OUTPUT_DIR}/archiver" ]; then
count=$(find "${OUTPUTDIR}/archiver" -type f | wc -l) count=$(find "${OUTPUT_DIR}/archiver" -type f | wc -l)
if [[ 0 -ne ${count} ]]; then if [[ 0 -ne ${count} ]]; then
echo "zipping ${count} archived files" echo "zipping ${count} archived files"
zip -q -m -r "${OUTPUTDIR}/test_logs.zip" "${OUTPUTDIR}/archiver" zip -q -m -r "${OUTPUT_DIR}/test_logs.zip" "${OUTPUT_DIR}/archiver"
else else
echo "No archived files, skipping compressing." echo "No archived files, skipping compressing."
fi fi
@ -250,17 +243,17 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}"
echo "No archiver directory, skipping compressing." echo "No archiver directory, skipping compressing."
fi fi
''' '''
// env variables don't work in archive? or this has to be relative to WORKSPACE. :( // Has to be relative to WORKSPACE.
archive 'output-jdk8/*' archive "${env.OUTPUT_DIR_RELATIVE}/*"
archive 'output-jdk8/**/*' archive "${env.OUTPUT_DIR_RELATIVE}/**/*"
publishHTML target: [ publishHTML target: [
allowMissing: true, allowMissing : true,
keepAll: true, keepAll : true,
alwaysLinkToLastBuild: true, alwaysLinkToLastBuild: true,
// has to be relative to WORKSPACE :( // Has to be relative to WORKSPACE.
reportDir: 'output-jdk8', reportDir : "${env.OUTPUT_DIR_RELATIVE}",
reportFiles: 'console-report.html', reportFiles : 'console-report.html',
reportName: 'JDK8 Nightly Build Report' reportName : 'JDK8 Nightly Build Report'
] ]
} }
} }

17
dev-support/hbase_nightly_yetus.sh
View File

@ -18,8 +18,8 @@
declare -i missing_env=0 declare -i missing_env=0
# Validate params # Validate params
for required_env in "TESTS" "TOOLS" "BASEDIR" "ARCHIVE_PATTERN_LIST" "OUTPUT_RELATIVE" \ for required_env in "TESTS" "TOOLS" "BASEDIR" "ARCHIVE_PATTERN_LIST" "OUTPUT_DIR_RELATIVE" \
"BRANCH_SPECIFIC_DOCKERFILE" "OUTPUTDIR" "PROJECT" "AUTHOR_IGNORE_LIST" \ "BRANCH_SPECIFIC_DOCKERFILE" "OUTPUT_DIR" "PROJECT" "AUTHOR_IGNORE_LIST" \
"WHITESPACE_IGNORE_LIST" "BRANCH_NAME" "TESTS_FILTER" "DEBUG" \ "WHITESPACE_IGNORE_LIST" "BRANCH_NAME" "TESTS_FILTER" "DEBUG" \
"USE_YETUS_PRERELEASE" "WORKSPACE" "YETUS_RELEASE"; do "USE_YETUS_PRERELEASE" "WORKSPACE" "YETUS_RELEASE"; do
if [ -z "${!required_env}" ]; then if [ -z "${!required_env}" ]; then
@ -49,15 +49,16 @@ YETUS_ARGS=("--basedir=${BASEDIR}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--archive-list=${ARCHIVE_PATTERN_LIST}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--archive-list=${ARCHIVE_PATTERN_LIST}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--console-urls" "${YETUS_ARGS[@]}") YETUS_ARGS=("--console-urls" "${YETUS_ARGS[@]}")
# YETUS-532, repeat this twice in case the fix is to update args rather than docs # YETUS-532, repeat this twice in case the fix is to update args rather than docs
YETUS_ARGS=("--build-url-patchdir=artifact/${OUTPUT_RELATIVE}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--build-url-patchdir=artifact/${OUTPUT_DIR_RELATIVE}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--build-url-artifacts=artifact/${OUTPUT_RELATIVE}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--build-url-artifacts=artifact/${OUTPUT_DIR_RELATIVE}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--docker" "${YETUS_ARGS[@]}") YETUS_ARGS=("--docker" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--dockerfile=${BRANCH_SPECIFIC_DOCKERFILE}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--dockerfile=${BRANCH_SPECIFIC_DOCKERFILE}" "${YETUS_ARGS[@]}")
# Yetus sets BUILDMODE env variable to "full" if this arg is passed.
YETUS_ARGS=("--empty-patch" "${YETUS_ARGS[@]}") YETUS_ARGS=("--empty-patch" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--html-report-file=${OUTPUTDIR}/console-report.html" "${YETUS_ARGS[@]}") YETUS_ARGS=("--html-report-file=${OUTPUT_DIR}/console-report.html" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--jenkins" "${YETUS_ARGS[@]}") YETUS_ARGS=("--jenkins" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--mvn-custom-repos" "${YETUS_ARGS[@]}") YETUS_ARGS=("--mvn-custom-repos" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--patch-dir=${OUTPUTDIR}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--patch-dir=${OUTPUT_DIR}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--project=${PROJECT}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--project=${PROJECT}" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--resetrepo" "${YETUS_ARGS[@]}") YETUS_ARGS=("--resetrepo" "${YETUS_ARGS[@]}")
YETUS_ARGS=("--author-ignore-list=${AUTHOR_IGNORE_LIST}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--author-ignore-list=${AUTHOR_IGNORE_LIST}" "${YETUS_ARGS[@]}")
@ -79,8 +80,8 @@ if [[ true == "${DEBUG}" ]]; then
YETUS_ARGS=("--debug" "${YETUS_ARGS[@]}") YETUS_ARGS=("--debug" "${YETUS_ARGS[@]}")
fi fi
rm -rf "${OUTPUTDIR}" rm -rf "${OUTPUT_DIR}"
mkdir -p "${OUTPUTDIR}" mkdir -p "${OUTPUT_DIR}"
if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then if [[ true != "${USE_YETUS_PRERELEASE}" ]]; then
YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/shelldocs" "${YETUS_ARGS[@]}") YETUS_ARGS=("--shelldocs=${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/shelldocs" "${YETUS_ARGS[@]}")
TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch" TESTPATCHBIN="${WORKSPACE}/yetus-${YETUS_RELEASE}/bin/test-patch"