You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2019/12/01 14:49:23 UTC
[bigtop] branch master updated (f183d94 -> bafe6ab)
This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git.
from f183d94 BIGTOP-3266: Rat check failed for one file with unapproved/unknown licenses
new 42ec950 BIGTOP-3029: --parser is invalidated in puppet v4.x
new bafe6ab BIGTOP-3029: --parser is invalidated in puppet v4.x (addendum)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
[bigtop] 01/02: BIGTOP-3029: --parser is invalidated in puppet v4.x
Posted by se...@apache.org.
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 42ec95088845c143f07e8047e8d9cbdaf3731c58
Author: Guodong Xu <gu...@linaro.org>
AuthorDate: Tue May 15 20:08:28 2018 +0800
BIGTOP-3029: --parser is invalidated in puppet v4.x
Starting from puppet 4.x, --parse is not a valid option for puppet any more.
This results in when running in pre-built image
bigtop/slaves:trunk-debian-9-aarch64 and :trunk-debian-9, we see this error:
$ sudo docker run -it --rm --workdir /ws -v `pwd`:/ws bigtop/slaves:trunk-debian-9-aarch64 bash -l
root@b40443df7cce:/ws# ./gradlew toolchain
Error: Could not parse application options: invalid option: --parser
This patch adds puppet version check in task toolchain. "--parser future" is
added into command only in puppet version 3.x
Signed-off-by: Guodong Xu <gu...@linaro.org>
Signed-off-by: Kengo Seki <se...@apache.org>
---
build.gradle | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index 66784eb..c78fcd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -226,11 +226,12 @@ apply from: 'release.gradle'
task toolchain(type:Exec,
description: 'Setup dev. env via toolchain; Requires: Puppet, sudo',
group: DEVENV_GROUP) {
- def command = [
- 'sudo', 'puppet', 'apply', '-d', '--parser', 'future',
- "--modulepath=${projectDir.absolutePath}:/etc/puppet/modules", '-e',
- 'include bigtop_toolchain::installer'
- ]
+ def command = ['sudo', 'puppet', 'apply', '-d']
+ if ("puppet --version".execute().text[0] == '3') {
+ command.addAll(['--parser', 'future'])
+ }
+ command.addAll(["--modulepath=${projectDir.absolutePath}:/etc/puppet/modules", '-e',
+ 'include bigtop_toolchain::installer'])
workingDir '.'
commandLine command
}
[bigtop] 02/02: BIGTOP-3029: --parser is invalidated in puppet v4.x
(addendum)
Posted by se...@apache.org.
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 <se...@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 <se...@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
}