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

HBASE-25021 Nightly job should skip hadoop-2 integration test for master (#2409) 

Signed-off-by: Guanghao Zhang <zghao@apache.org>
This commit is contained in:
Duo Zhang 2020-09-17 08:48:11 +08:00
parent 7a3bb8aefe
commit 0f3a66554f
2 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev-support/Jenkinsfile vendored
View File

@ -596,6 +596,7 @@ pipeline {
} }
environment { environment {
BASEDIR = "${env.WORKSPACE}/component" BASEDIR = "${env.WORKSPACE}/component"
BRANCH = "${env.BRANCH_NAME}"
} }
steps { steps {
sh '''#!/bin/bash -e sh '''#!/bin/bash -e
@ -646,8 +647,9 @@ pipeline {
tar --strip-component=1 -xzf "${client_artifact}" -C "hbase-client" tar --strip-component=1 -xzf "${client_artifact}" -C "hbase-client"
''' '''
unstash 'hadoop-2' unstash 'hadoop-2'
echo "Attempting to use run an instance on top of Hadoop 2."
sh '''#!/bin/bash -xe sh '''#!/bin/bash -xe
if [[ "${BRANCH}" = branch-2* ]] || [[ "${BRANCH}" = branch-1* ]]; then
echo "Attempting to use run an instance on top of Hadoop 2."
artifact=$(ls -1 "${WORKSPACE}"/hadoop-2*.tar.gz | head -n 1) artifact=$(ls -1 "${WORKSPACE}"/hadoop-2*.tar.gz | head -n 1)
tar --strip-components=1 -xzf "${artifact}" -C "hadoop-2" tar --strip-components=1 -xzf "${artifact}" -C "hadoop-2"
if ! "${BASEDIR}/dev-support/hbase_nightly_pseudo-distributed-test.sh" \ if ! "${BASEDIR}/dev-support/hbase_nightly_pseudo-distributed-test.sh" \
@ -664,10 +666,16 @@ pipeline {
echo "(x) {color:red}-1 client integration test{color}\n--Failed when running client tests on top of Hadoop 2. [see log for details|${BUILD_URL}/artifact/output-integration/hadoop-2.log]. (note that this means we didn't run on Hadoop 3)" >output-integration/commentfile echo "(x) {color:red}-1 client integration test{color}\n--Failed when running client tests on top of Hadoop 2. [see log for details|${BUILD_URL}/artifact/output-integration/hadoop-2.log]. (note that this means we didn't run on Hadoop 3)" >output-integration/commentfile
exit 2 exit 2
fi fi
else
echo "Skipping to run against Hadoop 2 for branch ${BRANCH}"
fi
''' '''
unstash 'hadoop-3' unstash 'hadoop-3'
echo "Attempting to use run an instance on top of Hadoop 3."
sh '''#!/bin/bash -e sh '''#!/bin/bash -e
if [[ "${BRANCH}" = branch-1* ]]; then
echo "Skipping to run against Hadoop 3 for branch ${BRANCH}"
else
echo "Attempting to use run an instance on top of Hadoop 3."
artifact=$(ls -1 "${WORKSPACE}"/hadoop-3*.tar.gz | head -n 1) artifact=$(ls -1 "${WORKSPACE}"/hadoop-3*.tar.gz | head -n 1)
tar --strip-components=1 -xzf "${artifact}" -C "hadoop-3" tar --strip-components=1 -xzf "${artifact}" -C "hadoop-3"
if ! "${BASEDIR}/dev-support/hbase_nightly_pseudo-distributed-test.sh" \ if ! "${BASEDIR}/dev-support/hbase_nightly_pseudo-distributed-test.sh" \
@ -701,6 +709,7 @@ pipeline {
exit 2 exit 2
fi fi
echo "(/) {color:green}+1 client integration test{color}" >output-integration/commentfile echo "(/) {color:green}+1 client integration test{color}" >output-integration/commentfile
fi
''' '''

2
dev-support/hbase_nightly_pseudo-distributed-test.sh
View File

@ -176,7 +176,7 @@ fi
echo "HBase version information:" echo "HBase version information:"
"${component_install}/bin/hbase" version 2>/dev/null "${component_install}/bin/hbase" version 2>/dev/null
hbase_version=$("${component_install}/bin/hbase" version | head -n 1 2>/dev/null) hbase_version=$("${component_install}/bin/hbase" version 2>&1 | grep ^HBase | head -n 1)
hbase_version="${hbase_version#HBase }" hbase_version="${hbase_version#HBase }"
if [ ! -s "${hbase_client}/lib/shaded-clients/hbase-shaded-mapreduce-${hbase_version}.jar" ]; then if [ ! -s "${hbase_client}/lib/shaded-clients/hbase-shaded-mapreduce-${hbase_version}.jar" ]; then