From commits-return-31783-archive-asf-public=cust-asf.ponee.io@hive.apache.org Wed Feb 21 14:55:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0581618061A for ; Wed, 21 Feb 2018 14:55:38 +0100 (CET) Received: (qmail 76202 invoked by uid 500); 21 Feb 2018 13:55:38 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 76191 invoked by uid 99); 21 Feb 2018 13:55:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2018 13:55:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 441E0DFBBB; Wed, 21 Feb 2018 13:55:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pvary@apache.org To: commits@hive.apache.org Message-Id: <6bfaff25ae63441e945d826f8109a073@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-18706: Ensure each Yetus execution has its own separate working dir (Adam Szita, reviewed by Peter Vary) Date: Wed, 21 Feb 2018 13:55:35 +0000 (UTC) Repository: hive Updated Branches: refs/heads/master 2d2311c0e -> 102731f6e HIVE-18706: Ensure each Yetus execution has its own separate working dir (Adam Szita, reviewed by Peter Vary) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/102731f6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/102731f6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/102731f6 Branch: refs/heads/master Commit: 102731f6e713fd8aedc9bb70f3367fe754559da5 Parents: 2d2311c Author: Peter Vary Authored: Wed Feb 21 14:54:51 2018 +0100 Committer: Peter Vary Committed: Wed Feb 21 14:54:51 2018 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/hive/ptest/execution/YetusPhase.java | 4 ++-- testutils/ptest2/src/main/resources/source-prep.vm | 6 +++--- testutils/ptest2/src/main/resources/yetus-exec.vm | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/102731f6/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java index 26545df..309d99d 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java @@ -57,12 +57,12 @@ public class YetusPhase extends Phase { super(hostExecutors, localCommandFactory, templateDefaults, logger); this.mPatchFile = patchFile; - this.mWorkingDir = new File(workingDir, YETUS_OUTPUT_FOLDER); + this.buildTag = templateDefaults.get("buildTag"); + this.mWorkingDir = new File(workingDir, YETUS_OUTPUT_FOLDER + "_" + this.buildTag); this.mLogFile = new File(logDir, YETUS_LOG_FILE); this.mOutputDir = new File(logDir, YETUS_OUTPUT_FOLDER); this.mScratchDir = scratchDir; this.conf = configuration; - this.buildTag = templateDefaults.get("buildTag"); this.buildUrl = conf.getLogsURL() + "/" + this.buildTag + "/"; } http://git-wip-us.apache.org/repos/asf/hive/blob/102731f6/testutils/ptest2/src/main/resources/source-prep.vm ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/resources/source-prep.vm b/testutils/ptest2/src/main/resources/source-prep.vm index d8dd202..c7e06b9 100644 --- a/testutils/ptest2/src/main/resources/source-prep.vm +++ b/testutils/ptest2/src/main/resources/source-prep.vm @@ -78,11 +78,11 @@ cd $workingDir/ echo "Unknown repository type '${repositoryType}'" exit 1 fi - rm -rf ../yetus - mkdir ../yetus + rm -rf ../yetus_${buildTag} + mkdir ../yetus_${buildTag} #Wait until git gc finishes in the background before proceeding: while ! git gc 2>/dev/null; do sleep 1s ; done - cp -R . ../yetus + cp -R . ../yetus_${buildTag} mkdir $logDir/yetus patchCommandPath=$workingDir/scratch/smart-apply-patch.sh patchFilePath=$workingDir/scratch/build.patch http://git-wip-us.apache.org/repos/asf/hive/blob/102731f6/testutils/ptest2/src/main/resources/yetus-exec.vm ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/resources/yetus-exec.vm b/testutils/ptest2/src/main/resources/yetus-exec.vm index a5327ca..7465391 100644 --- a/testutils/ptest2/src/main/resources/yetus-exec.vm +++ b/testutils/ptest2/src/main/resources/yetus-exec.vm @@ -24,6 +24,7 @@ export JAVA_HOME=${javaHome} export PATH=$JAVA_HOME/bin/:$PATH ./dev-support/test-patch.sh ${patchFile} --jenkins --jira-base-url=${jiraUrl} --jira-user=${jiraUser} \ --jira-password=${jiraPass} --patch-dir=${outputDir} --build-url=${buildUrl} --build-url-console=${buildUrlLog} \ - --build-url-artifacts=${buildUrlOutputDir} 2>&1 > ${logFile} + --build-url-artifacts=${buildUrlOutputDir} 2>&1 > ${logFile} || true popd +rm -rf ${workingDir}