You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/03/23 22:46:08 UTC

svn commit: r1668747 - in /hive/trunk: dev-support/jenkins-common.sh dev-support/jenkins-execute-hms-test.sh dev-support/jenkins-submit-build.sh testutils/metastore/metastore-upgrade-test.sh

Author: brock
Date: Mon Mar 23 21:46:07 2015
New Revision: 1668747

URL: http://svn.apache.org/r1668747
Log:
HIVE-10019 - Configure jenkins precommit jobs to run HMS upgrade tests (Brock via Sergio)

Modified:
    hive/trunk/dev-support/jenkins-common.sh
    hive/trunk/dev-support/jenkins-execute-hms-test.sh
    hive/trunk/dev-support/jenkins-submit-build.sh
    hive/trunk/testutils/metastore/metastore-upgrade-test.sh

Modified: hive/trunk/dev-support/jenkins-common.sh
URL: http://svn.apache.org/viewvc/hive/trunk/dev-support/jenkins-common.sh?rev=1668747&r1=1668746&r2=1668747&view=diff
==============================================================================
--- hive/trunk/dev-support/jenkins-common.sh (original)
+++ hive/trunk/dev-support/jenkins-common.sh Mon Mar 23 21:46:07 2015
@@ -91,3 +91,9 @@ process_jira() {
   fi
   export BUILD_OPTS=$build_opts
 }
+
+# Checks if a specified URL patch contains HMS upgrade changes
+# Returns 0 if there are changes; non-zero value otherwise.
+patch_contains_hms_upgrade() {
+	curl -s "$1" | grep "^diff.*metastore/scripts/upgrade/" >/dev/null
+}
\ No newline at end of file

Modified: hive/trunk/dev-support/jenkins-execute-hms-test.sh
URL: http://svn.apache.org/viewvc/hive/trunk/dev-support/jenkins-execute-hms-test.sh?rev=1668747&r1=1668746&r2=1668747&view=diff
==============================================================================
--- hive/trunk/dev-support/jenkins-execute-hms-test.sh (original)
+++ hive/trunk/dev-support/jenkins-execute-hms-test.sh Mon Mar 23 21:46:07 2015
@@ -163,10 +163,6 @@ create_publish_file() {
 	echo $json_file
 }
 
-patch_contains_hms_upgrade() {
-	curl -s "$1" | grep "^diff.*metastore/scripts/upgrade/" >/dev/null
-}
-
 if patch_contains_hms_upgrade "$PATCH_URL"; then
 	ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i $SSH_KEY $SSH_HOST "
 		rm -rf metastore/ &&
@@ -184,6 +180,10 @@ if patch_contains_hms_upgrade "$PATCH_UR
 		do
 			if echo $line | grep 'Test failed' > /dev/null; then
 				FAILED_TESTS+=("$line")
+			elif echo $line | grep 'Executing sql test' >/dev/null; then
+				# Remove 'Executing sql test' line from MESSAGES log to avoid a verbose
+				# comment on JIRA
+				continue
 			fi
 
 			MESSAGES+=("$line")

Modified: hive/trunk/dev-support/jenkins-submit-build.sh
URL: http://svn.apache.org/viewvc/hive/trunk/dev-support/jenkins-submit-build.sh?rev=1668747&r1=1668746&r2=1668747&view=diff
==============================================================================
--- hive/trunk/dev-support/jenkins-submit-build.sh (original)
+++ hive/trunk/dev-support/jenkins-submit-build.sh Mon Mar 23 21:46:07 2015
@@ -27,23 +27,28 @@ case "$BUILD_PROFILE" in
   trunk-mr1|trunk-mr2)
    test -n "$TRUNK_URL" || fail "TRUNK_URL must be specified"
    url="$TRUNK_URL&ISSUE_NUM=$ISSUE_NUM"
-   curl -v -i "$url"
-   exit 0
   ;;
   spark-mr2)
    test -n "$SPARK_URL" || fail "SPARK_URL must be specified"
    url="$SPARK_URL&ISSUE_NUM=$ISSUE_NUM"
-   curl -v -i "$url"
-   exit 0
   ;;
   encryption-mr2)
    test -n "$ENCRYPTION_URL" || fail "ENCRYPTION_URL must be specified"
    url="$ENCRYPTION_URL&ISSUE_NUM=$ISSUE_NUM"
-   curl -v -i "$url"
-   exit 0
   ;;
   *)
   echo "Unknown profile '$BUILD_PROFILE'"
   exit 1
   ;;
 esac
+
+# Execute jenkins job for HMS upgrade tests if needed
+if patch_contains_hms_upgrade "${JIRA_ROOT_URL}$PATCH_URL"; then
+  test -n "$HMS_UPGRADE_URL" || fail "HMS_UPGRADE_URL must be specified"
+  echo "Calling HMS upgrade testing job..."
+  curl -v -i "${HMS_UPGRADE_URL}&ISSUE_NUM=${ISSUE_NUM}&BRANCH=${BRANCH}"
+fi
+
+# Execute jenkins job for specific profile
+echo "Calling Precommit $BRANCH Build..."
+curl -v -i "$url"

Modified: hive/trunk/testutils/metastore/metastore-upgrade-test.sh
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/metastore/metastore-upgrade-test.sh?rev=1668747&r1=1668746&r2=1668747&view=diff
==============================================================================
--- hive/trunk/testutils/metastore/metastore-upgrade-test.sh (original)
+++ hive/trunk/testutils/metastore/metastore-upgrade-test.sh Mon Mar 23 21:46:07 2015
@@ -94,6 +94,7 @@ log "Server prepared."
 #
 
 execute_test() {
+	log "Executing sql test: $DB_SERVER/$(basename $1)"
 	if ! bash -x -e $SCRIPT_EXECUTE $1; then
 		log "Test failed: $DB_SERVER/$(basename $1)"
 		return 1