[bigtop] branch master updated: BIGTOP-3173. Fix bugs and improve usability of COMPONENT-pkg-ind (#480)

[ev...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new e1117b7  BIGTOP-3173. Fix bugs and improve usability of COMPONENT-pkg-ind (#480)
e1117b7 is described below

commit e1117b7c94092a05c0aaeb835eed272cbc70ee9e
Author: Evans Ye <ev...@apache.org>
AuthorDate: Thu Feb 21 15:37:03 2019 +0800

    BIGTOP-3173. Fix bugs and improve usability of COMPONENT-pkg-ind (#480)
---
 bigtop-ci/build.sh | 11 +++++++----
 packages.gradle    |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bigtop-ci/build.sh b/bigtop-ci/build.sh
index db9fb39..ef16a6f 100755
--- a/bigtop-ci/build.sh
+++ b/bigtop-ci/build.sh
@@ -53,8 +53,6 @@ esac
 shift
 done
 
-set -e
-
 if [ -z ${PREFIX+x} ]; then
     echo "PREFIX is required";
     UNSATISFIED=true
@@ -75,9 +73,14 @@ docker cp $BIGTOP_HOME $CONTAINER_ID:/bigtop
 docker cp $BIGTOP_HOME/bigtop-ci/entrypoint.sh $CONTAINER_ID:/bigtop/entrypoint.sh
 
 # Build
-docker exec $CONTAINER_ID bash -c "cd /bigtop && ./entrypoint.sh $CONFIGURE_NEXUS $TARGET"
+docker exec $CONTAINER_ID bash -c "cd /bigtop && ./entrypoint.sh $CONFIGURE_NEXUS $TARGET --info"
+RESULT=$?
 
 # save result
 mkdir -p output
 docker cp $CONTAINER_ID:/bigtop/output .
-#docker rm -f $CONTAINER_ID
+docker rm -f $CONTAINER_ID
+
+if [ $RESULT -ne 0 ]; then
+    exit 1
+fi
diff --git a/packages.gradle b/packages.gradle
index 25f782d..af2e6ef 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -619,6 +619,7 @@ def genTasks = { target ->
     def _nexus = project.hasProperty("nexus") ? nexus : false
     def _target_pkg = "$target-pkg"
     def command = [
+            'bash', '-x',
             './bigtop-ci/build.sh',
             '--prefix', _prefix,
             '--os', _OS,