diff --git testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java index 26545df4fd7795e0043be61302743c1ba6883eb1..309d99d64d351bacb3a833411cc0fa578957cf35 100644 --- testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java +++ testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/YetusPhase.java @@ -57,12 +57,12 @@ public YetusPhase(TestConfiguration configuration, List hostExecut 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 + "/"; } diff --git testutils/ptest2/src/main/resources/source-prep.vm testutils/ptest2/src/main/resources/source-prep.vm index d8dd202d9ed40355def70d0e81ff61189f39a131..c7e06b9316d2780bd877a6d8e1c29818fc7fbe03 100644 --- testutils/ptest2/src/main/resources/source-prep.vm +++ 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 diff --git testutils/ptest2/src/main/resources/yetus-exec.vm testutils/ptest2/src/main/resources/yetus-exec.vm index a5327ca32575b5c69045569663ef00504f4b4256..7465391f8a6215b8be3194e6f89cfd8b7fed421b 100644 --- testutils/ptest2/src/main/resources/yetus-exec.vm +++ 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}