yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [3/9] yetus git commit: YETUS-95. docker not working on jenkins w/hadoop
Date Tue, 20 Oct 2015 15:06:19 GMT
YETUS-95. docker not working on jenkins w/hadoop

Signed-off-by: Allen Wittenauer <aw@apache.org>


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

Branch: refs/heads/YETUS-83
Commit: d3c21d0eecf865fc4ad985475c25d801af0c44ed
Parents: b3a6ae0
Author: Allen Wittenauer <aw@apache.org>
Authored: Sat Oct 17 19:51:37 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Tue Oct 20 07:35:48 2015 -0700

----------------------------------------------------------------------
 dev-support/test-patch-docker/launch-test-patch.sh |  4 ++--
 dev-support/test-patch.sh                          | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/d3c21d0e/dev-support/test-patch-docker/launch-test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch-docker/launch-test-patch.sh b/dev-support/test-patch-docker/launch-test-patch.sh
index e60debd..ac976ad 100755
--- a/dev-support/test-patch-docker/launch-test-patch.sh
+++ b/dev-support/test-patch-docker/launch-test-patch.sh
@@ -46,5 +46,5 @@ cd "${PATCH_DIR}/precommit/"
    --basedir="${BASEDIR}" \
    --patch-dir="${PATCH_DIR}" \
    --java-home="${JAVA_HOME}" \
-   --plugins="${PATCH_DIR}/precommit/user-plugins" \
-   --jira-cmd=/opt/jiracli/jira-cli-2.2.0/jira.sh
+   --personality="${PATCH_DIR}/precommit/personality/provided.sh" \
+   --user-plugins="${PATCH_DIR}/precommit/user-plugins"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/yetus/blob/d3c21d0e/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 6be3242..0abcf66 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -289,7 +289,9 @@ function prepopulate_footer
   add_footer_table "uname" "${unamea}"
   add_footer_table "Build tool" "${BUILDTOOL}"
 
-  if [[ -n ${PERSONALITY} ]]; then
+  if [[ -n ${REEXECPERSONALITY} ]]; then
+    add_footer_table "Personality" "${REEXECPERSONALITY}"
+  elif [[ -n ${PERSONALITY} ]]; then
     add_footer_table "Personality" "${PERSONALITY}"
   fi
 
@@ -828,6 +830,9 @@ function parse_args
         INSTANCE=${i#*=}
         EXECUTOR_NUMBER=${INSTANCE}
       ;;
+      --tpperson=*)
+        REEXECPERSONALITY=${i#*=}
+      ;;
       --tpreexectimer=*)
         REEXECLAUNCHTIMER=${i#*=}
       ;;
@@ -1399,11 +1404,7 @@ function copytpbits
 
   if [[ -n ${PERSONALITY}
     && -f ${PERSONALITY} ]]; then
-    cp -pr "${PERSONALITY}" "${PATCH_DIR}/precommit/personality"
-    person=$(basename "${PERSONALITY}")
-
-    # Set to be relative to ${PATCH_DIR}/precommit
-    PERSONALITY="${PATCH_DIR}/precommit/personality/${person}"
+    cp -pr "${PERSONALITY}" "${PATCH_DIR}/precommit/personality/provided.sh"
   fi
 
   if [[ -n ${DOCKERFILE}
@@ -1520,8 +1521,8 @@ function check_reexec
     TESTPATCHMODE="--tpglobaltimer=${GLOBALTIMER} ${TESTPATCHMODE}"
     TESTPATCHMODE="--tpreexectimer=${TIMER} ${TESTPATCHMODE}"
     TESTPATCHMODE="--tpinstance=${INSTANCE} ${TESTPATCHMODE}"
-    TESTPATCHMODE="--personality=\'${PERSONALITY}\' ${TESTPATCHMODE}"
-    TESTPATCHMODE="--plugins=\'${USER_PLUGIN_DIR}\' ${TESTPATCHMODE}"
+    TESTPATCHMODE="--tpperson=${PERSONALITY} ${TESTPATCHMODE}"
+    TESTPATCHMODE="--plugins=${ENABLED_PLUGINS// /,} ${TESTPATCHMODE}"
     TESTPATCHMODE=" ${TESTPATCHMODE}"
     export TESTPATCHMODE
 


Mime
View raw message