minor, enhance dev-support scripts
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/937cc546 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/937cc546 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/937cc546 Branch: refs/heads/orderedbytes Commit: 937cc546d1dc34832217f1b806f3e91aa486caa4 Parents: e22039d Author: Yang Li <liy...@apache.org> Authored: Tue Oct 4 15:45:45 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Tue Oct 4 15:45:45 2016 +0800 ---------------------------------------------------------------------- dev-support/sync_hbase_cdh_branches.cmd | 44 +++++++++++++++++----- dev-support/test_all_against_hdp_2_2_4_2_2.sh | 2 +- 2 files changed, 35 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/937cc546/dev-support/sync_hbase_cdh_branches.cmd ---------------------------------------------------------------------- diff --git a/dev-support/sync_hbase_cdh_branches.cmd b/dev-support/sync_hbase_cdh_branches.cmd index 0febfbb..ed828ca 100644 --- a/dev-support/sync_hbase_cdh_branches.cmd +++ b/dev-support/sync_hbase_cdh_branches.cmd @@ -1,19 +1,43 @@ -git checkout master -git pull -git reset apache/master --hard +#!/bin/bash + +# ============================================================================ + +base=master + +# ============================================================================ + +set -o pipefail # trace ERR through pipes +set -o errtrace # trace ERR through 'time command' and other functions +function error() { + SCRIPT="$0" # script name + LASTLINE="$1" # line of error occurrence + LASTERR="$2" # error code + echo "ERROR exit from ${SCRIPT} : line ${LASTLINE} with exit code ${LASTERR}" + exit 1 +} +trap 'error ${LINENO} ${?}' ERR + +# ============================================================================ -git checkout apache/1.5.x-HBase1.x +git fetch apache +git checkout apache/$base-hbase1.x git format-patch -1 -git checkout master +git checkout apache/$base-cdh1.x +git format-patch -1 + +git checkout apache/$base +git checkout -b tmp +git reset apache/$base --hard + git am -3 --ignore-whitespace 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch -git push apache master:1.5.x-HBase1.x -f +#git push apache tmp:$base-hbase1.x -f rm 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch -git checkout apache/1.5.x-CDH5.7 -git format-patch -1 -git checkout master git am -3 --ignore-whitespace 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch -git push apache master:1.5.x-CDH5.7 -f +#git push apache tmp:$base-cdh5.7 -f rm 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch +# clean up +git checkout master git reset apache/master --hard +git checkout -b tmp http://git-wip-us.apache.org/repos/asf/kylin/blob/937cc546/dev-support/test_all_against_hdp_2_2_4_2_2.sh ---------------------------------------------------------------------- diff --git a/dev-support/test_all_against_hdp_2_2_4_2_2.sh b/dev-support/test_all_against_hdp_2_2_4_2_2.sh index f0d27e4..f7780dd 100644 --- a/dev-support/test_all_against_hdp_2_2_4_2_2.sh +++ b/dev-support/test_all_against_hdp_2_2_4_2_2.sh @@ -22,4 +22,4 @@ cd ${dir} cd .. mvn clean install -DskipTests 2>&1 | tee mci.log -mvn verify -Dhdp.version=2.2.4.2-2 -fae 2>&1 | tee mvnverify.log +mvn verify -Dhdp.version=${HDP_VERSION:-"2.2.4.2-2"} -fae 2>&1 | tee mvnverify.log
