[bigtop] 02/02: BIGTOP-3029: --parser is invalidated in puppet v4.x (addendum)

[sekikn]

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

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

commit bafe6abcf917bd0db991ccb8e5b95f090fadeba7
Author: Kengo Seki <sek...@apache.org>
AuthorDate: Wed Nov 27 08:56:45 2019 +0900

    BIGTOP-3029: --parser is invalidated in puppet v4.x (addendum)
    
    Signed-off-by: Kengo Seki <sek...@apache.org>
---
 build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index c78fcd6..b1c07b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -227,11 +227,12 @@ task toolchain(type:Exec,
     description: 'Setup dev. env via toolchain; Requires: Puppet, sudo',
     group: DEVENV_GROUP) {
   def command = ['sudo', 'puppet', 'apply', '-d']
-  if ("puppet --version".execute().text[0] == '3') {
+  def version = "sudo puppet --version".execute().text
+  if ('3.7' <= version && version < '4') {
     command.addAll(['--parser', 'future'])
   }
-  
command.addAll(["--modulepath=${projectDir.absolutePath}:/etc/puppet/modules", 
'-e',
-      'include bigtop_toolchain::installer'])
+  
command.addAll(["--modulepath=${projectDir.absolutePath}:/etc/puppet/modules:/usr/share/puppet/modules",
+    '-e', 'include bigtop_toolchain::installer'])
   workingDir '.'
   commandLine command
 }