diff --git dev-support/jenkins-execute-build.sh dev-support/jenkins-execute-build.sh index b2ba8e9..56023ae 100644 --- dev-support/jenkins-execute-build.sh +++ dev-support/jenkins-execute-build.sh @@ -26,7 +26,16 @@ build_ptest_client() { test -d $PTEST_BUILD_DIR || mkdir -p $PTEST_BUILD_DIR cd $PTEST_BUILD_DIR && rm -rf hive - git clone --depth 1 https://github.com/apache/hive.git + unset GIT_CLONE_ARGS + if [ -n "${PTEST_GIT_BRANCH}" ]; then + GIT_CLONE_ARGS=" -b ${PTEST_GIT_BRANCH}" + fi + if [ -z "${PTEST_GIT_REPO}" ]; then + PTEST_GIT_REPO=https://github.com/apache/hive.git + fi + GIT_CLONE_ARGS=${GIT_CLONE_ARGS}" ${PTEST_GIT_REPO} hive" + + git clone --depth 1 ${GIT_CLONE_ARGS} cd hive/testutils/ptest2 mvn clean package -DskipTests -Drat.numUnapprovedLicenses=1000 -Dmaven.repo.local=$MVN_REPO_LOCAL } @@ -42,7 +51,7 @@ call_ptest_server() { local PTEST_CLASSPATH="$PTEST_BUILD_DIR/hive/testutils/ptest2/target/hive-ptest-1.0-classes.jar:$PTEST_BUILD_DIR/hive/testutils/ptest2/target/lib/*" java -cp "$PTEST_CLASSPATH" org.apache.hive.ptest.api.client.PTestClient --command testStart \ - --outputDir "$PTEST_BUILD_DIR/hive/testutils/ptest2/target" --password "$JIRA_PASSWORD" "$@" + --outputDir "$PTEST_BUILD_DIR/hive/testutils/ptest2/target" --password "$JIRA_PASSWORD" "$@" } # Unpack all test results @@ -99,10 +108,13 @@ if [ -n "$JIRA_ISSUE" ]; then fail "attachment $attachment_id is already tested for $JIRA_ISSUE" fi - BUILD_PROFILE=`get_branch_profile $JIRA_PATCH_URL $JIRA_INFO_FILE` - if [ -z "$BUILD_PROFILE" ]; then - BUILD_PROFILE="$DEFAULT_BUILD_PROFILE" - fi + # Use the BUILD_PROFILE if it is provided. + if [ -z ${BUILD_PROFILE} ]; then + BUILD_PROFILE=`get_branch_profile $JIRA_PATCH_URL $JIRA_INFO_FILE` + if [ -z "$BUILD_PROFILE" ]; then + BUILD_PROFILE="$DEFAULT_BUILD_PROFILE" + fi + fi if is_clear_cache_set $JIRA_INFO_FILE; then optionalArgs+=(--clearLibraryCache) @@ -112,8 +124,10 @@ if [ -n "$JIRA_ISSUE" ]; then echo "ISSUE: $JIRA_ISSUE PROFILE: $BUILD_PROFILE" else - # If not JIRA is specified, then use a default profile - BUILD_PROFILE="$DEFAULT_BUILD_PROFILE" + # If not JIRA is specified, and no BUILD_PROFILE provided, then use a default profile + if [ -z ${BUILD_PROFILE} ]; then + BUILD_PROFILE="$DEFAULT_BUILD_PROFILE" + fi echo "ISSUE: unspecified PROFILE: $BUILD_PROFILE" fi