commit bafe6abcf917bd0db991ccb8e5b95f090fadeba7
author Kengo Seki <sekikn@apache.org> Wed Nov 27 08:56:45 2019 +0900
committer Kengo Seki <sekikn@apache.org> Sun Dec 01 23:48:32 2019 +0900
tree 3ac5f9bdb3b254f4eb4cc9ce8ab05bd4f8e1534d
parent 42ec95088845c143f07e8047e8d9cbdaf3731c58

BIGTOP-3029: --parser is invalidated in puppet v4.x (addendum)

Signed-off-by: Kengo Seki <sekikn@apache.org>

build.gradle

diff --git a/build.gradle b/build.gradle
index c78fcd6..b1c07b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -227,11 +227,12 @@
     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
 }