Repository: bigtop Updated Branches: refs/heads/master 8597be490 -> 155a296b6
BIGTOP-2978: Fix bigtop_toolchain for fedora: no epel-release necessary Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/155a296b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/155a296b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/155a296b Branch: refs/heads/master Commit: 155a296b66323da39dea2e76366845926b4ed6c4 Parents: 8597be4 Author: Youngwoo Kim <[email protected]> Authored: Sat Dec 30 15:21:27 2017 +0900 Committer: Olaf Flebbe <[email protected]> Committed: Sat Dec 30 22:25:04 2017 +0100 ---------------------------------------------------------------------- bigtop_toolchain/manifests/packages.pp | 9 +++++++-- bigtop_toolchain/manifests/renv.pp | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/155a296b/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 715a606..beb786d 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -62,8 +62,7 @@ class bigtop_toolchain::packages { "libevent-devel", "apr-devel", "bison", - "libffi-devel", - "epel-release" + "libffi-devel" ] } /(?i:(SLES|opensuse))/: { $pkgs = [ @@ -225,4 +224,10 @@ class bigtop_toolchain::packages { target => '/usr/lib/rpm/amazon', } } + + if $operatingsystem == 'CentOS' { + package { 'epel-release': + ensure => installed + } + } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/155a296b/bigtop_toolchain/manifests/renv.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/renv.pp b/bigtop_toolchain/manifests/renv.pp index 776340a..4d54434 100644 --- a/bigtop_toolchain/manifests/renv.pp +++ b/bigtop_toolchain/manifests/renv.pp @@ -14,6 +14,9 @@ # limitations under the License. class bigtop_toolchain::renv { + + require bigtop_toolchain::packages + case $operatingsystem{ /(?i:(centos|fedora|Amazon))/: { $pkgs = [ @@ -46,5 +49,6 @@ class bigtop_toolchain::renv { exec { 'install_r_packages': cwd => "/usr/bin", command => "/usr/bin/R -e \"install.packages(c('devtools', 'evaluate', 'rmarkdown', 'knitr', 'roxygen2', 'testthat', 'e1071'), repos = 'http://cran.us.r-project.org')\"", + timeout => 1800 } }
