yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject yetus git commit: YETUS-661. ant/gradle/maven assumes container $HOME and host $HOME are the same
Date Fri, 17 Aug 2018 00:48:24 GMT
Repository: yetus
Updated Branches:
  refs/heads/master f19094a14 -> 2a5534e13


YETUS-661. ant/gradle/maven assumes container $HOME and host $HOME are the same

Signed-off-by: Jack Bearden <jack@jackbearden.com>


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/2a5534e1
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/2a5534e1
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/2a5534e1

Branch: refs/heads/master
Commit: 2a5534e131f501b2a0f3fb86ab606500ee58ac94
Parents: f19094a
Author: Allen Wittenauer <aw@apache.org>
Authored: Wed Aug 15 10:19:53 2018 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Thu Aug 16 17:48:00 2018 -0700

----------------------------------------------------------------------
 precommit/test-patch.d/ant.sh    | 2 +-
 precommit/test-patch.d/gradle.sh | 2 +-
 precommit/test-patch.d/maven.sh  | 2 +-
 precommit/test-patch.sh          | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/2a5534e1/precommit/test-patch.d/ant.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/ant.sh b/precommit/test-patch.d/ant.sh
index 63aa7ca..4c81741 100755
--- a/precommit/test-patch.d/ant.sh
+++ b/precommit/test-patch.d/ant.sh
@@ -217,5 +217,5 @@ function ant_builtin_personality_file_tests
 
 function ant_docker_support
 {
-  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS}" "-v" "${HOME}/.ivy2:${HOME}/.ivy2")
+  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS}" "-v" "${HOME}/.ivy2:/home/${USER_NAME}/.ivy2")
 }

http://git-wip-us.apache.org/repos/asf/yetus/blob/2a5534e1/precommit/test-patch.d/gradle.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/gradle.sh b/precommit/test-patch.d/gradle.sh
index c8d5088..8c78ab4 100755
--- a/precommit/test-patch.d/gradle.sh
+++ b/precommit/test-patch.d/gradle.sh
@@ -293,5 +293,5 @@ function gradle_builtin_personality_file_tests
 
 function gradle_docker_support
 {
-  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "-v" "${HOME}/.gradle:${HOME}/.gradle")
+  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "-v" "${HOME}/.gradle:/home/${USER_NAME}/.gradle")
 }

http://git-wip-us.apache.org/repos/asf/yetus/blob/2a5534e1/precommit/test-patch.d/maven.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh
index f1e2527..f772d2a 100755
--- a/precommit/test-patch.d/maven.sh
+++ b/precommit/test-patch.d/maven.sh
@@ -587,7 +587,7 @@ function maven_precompile
 
 function maven_docker_support
 {
-  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "-v" "${HOME}/.m2:${HOME}/.m2")
+  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "-v" "${HOME}/.m2:/home/${USER_NAME}/.m2")
 
   if [[ ${MAVEN_CUSTOM_REPOS} = true ]]; then
     DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "-v" "${MAVEN_CUSTOM_REPOS_DIR}:${MAVEN_CUSTOM_REPOS_DIR}")

http://git-wip-us.apache.org/repos/asf/yetus/blob/2a5534e1/precommit/test-patch.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh
index 93b20df..8a58605 100755
--- a/precommit/test-patch.sh
+++ b/precommit/test-patch.sh
@@ -1794,6 +1794,8 @@ function check_reexec
     # if we are doing docker, then we re-exec, but underneath the
     # container
 
+    determine_user
+
     for plugin in ${PROJECT_NAME} ${BUILDTOOL} ${BUGSYSTEMS} ${TESTTYPES} ${TESTFORMATS};
do
       if declare -f ${plugin}_docker_support >/dev/null; then
         "${plugin}_docker_support"


Mime
View raw message