[bigtop] branch master updated: BIGTOP-3197. [Docker] Treat both exit code 0 and 2 as success for Puppet execution (#506)

[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 1018b4c  BIGTOP-3197. [Docker] Treat both exit code 0 and 2 as success for Puppet execution (#506)
1018b4c is described below

commit 1018b4cbb9c42ab382dec80be8d8716bdc029cd9
Author: Evans Ye <ev...@apache.org>
AuthorDate: Tue Mar 26 16:57:21 2019 +0800

    BIGTOP-3197. [Docker] Treat both exit code 0 and 2 as success for Puppet execution (#506)
---
 docker/bigtop-slaves/Dockerfile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/bigtop-slaves/Dockerfile.template b/docker/bigtop-slaves/Dockerfile.template
index ad92136..ece6ca5 100644
--- a/docker/bigtop-slaves/Dockerfile.template
+++ b/docker/bigtop-slaves/Dockerfile.template
@@ -19,6 +19,6 @@ MAINTAINER dev@bigtop.apache.org
 
 COPY bigtop_toolchain PUPPET_MODULES
 
-RUN  UPDATE_SOURCE && puppet apply -e "include bigtop_toolchain::installer"
+RUN  UPDATE_SOURCE && puppet apply -e "include bigtop_toolchain::installer" || if [ $? -ne 2 ]; then exit 1; fi
 COPY . /tmp/bigtop
 RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/*