Repository: bigtop Updated Branches: refs/heads/master 41536b9be -> 0ee641d71
BIGTOP-2384: Refactor toolchain code to extract packages version out of every action Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0ee641d7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0ee641d7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0ee641d7 Branch: refs/heads/master Commit: 0ee641d714a8e1cc50eabb880fb011906ec47115 Parents: 41536b9 Author: Kengo Seki <[email protected]> Authored: Tue Oct 18 06:33:27 2016 +0900 Committer: Konstantin Boudnik <[email protected]> Committed: Tue Oct 18 12:32:20 2016 -0700 ---------------------------------------------------------------------- bigtop_toolchain/manifests/env.pp | 9 ++++++--- bigtop_toolchain/manifests/gradle.pp | 17 ++++++++++------- bigtop_toolchain/manifests/groovy.pp | 17 ++++++++++------- bigtop_toolchain/manifests/maven.pp | 2 +- bigtop_toolchain/manifests/vagrant.pp | 11 +++++++---- 5 files changed, 34 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0ee641d7/bigtop_toolchain/manifests/env.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp index f86571b..03d1b03 100644 --- a/bigtop_toolchain/manifests/env.pp +++ b/bigtop_toolchain/manifests/env.pp @@ -14,6 +14,9 @@ # limitations under the License. class bigtop_toolchain::env { + $java_version = '1.7.0' + $java = "java-${java_version}" + case $architecture { 'amd64' : { $arch= "amd64" } 'ppc64le' : { $arch= "ppc64el" } @@ -21,13 +24,13 @@ class bigtop_toolchain::env { } case $operatingsystem { 'Ubuntu','Debian': { - $javahome = "/usr/lib/jvm/java-1.7.0-openjdk-$arch" + $javahome = "/usr/lib/jvm/${java}-openjdk-$arch" } 'Fedora','Centos', 'Amazon': { - $javahome = "/usr/lib/jvm/java-1.7.0" + $javahome = "/usr/lib/jvm/${java}" } 'OpenSuSE' : { - $javahome = "/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0" + $javahome = "/usr/lib64/jvm/${java}-openjdk-${java_version}" } } file { '/etc/profile.d/bigtop.sh': http://git-wip-us.apache.org/repos/asf/bigtop/blob/0ee641d7/bigtop_toolchain/manifests/gradle.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/gradle.pp b/bigtop_toolchain/manifests/gradle.pp index aa4247a..3557cb9 100644 --- a/bigtop_toolchain/manifests/gradle.pp +++ b/bigtop_toolchain/manifests/gradle.pp @@ -15,21 +15,24 @@ class bigtop_toolchain::gradle { - exec {"/usr/bin/wget http://services.gradle.org/distributions/gradle-2.7-bin.zip": + $gradle_version = '2.7' + $gradle = "gradle-${gradle_version}" + + exec {"/usr/bin/wget http://services.gradle.org/distributions/${gradle}-bin.zip": cwd => "/usr/src", - unless => "/usr/bin/test -f /usr/src/gradle-2.7-bin.zip", + unless => "/usr/bin/test -f /usr/src/${gradle}-bin.zip", } - exec {'/usr/bin/unzip -x -o /usr/src/gradle-2.7-bin.zip': + exec {"/usr/bin/unzip -x -o /usr/src/${gradle}-bin.zip": cwd => '/usr/local', refreshonly => true, - subscribe => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.7-bin.zip";], - require => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.7-bin.zip";], + subscribe => Exec["/usr/bin/wget http://services.gradle.org/distributions/${gradle}-bin.zip";], + require => Exec["/usr/bin/wget http://services.gradle.org/distributions/${gradle}-bin.zip";], } file {'/usr/local/gradle': ensure => link, - target => '/usr/local/gradle-2.7', - require => Exec['/usr/bin/unzip -x -o /usr/src/gradle-2.7-bin.zip'], + target => "/usr/local/${gradle}", + require => Exec["/usr/bin/unzip -x -o /usr/src/${gradle}-bin.zip"], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0ee641d7/bigtop_toolchain/manifests/groovy.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/groovy.pp b/bigtop_toolchain/manifests/groovy.pp index 2d6eb7c..f50886a 100644 --- a/bigtop_toolchain/manifests/groovy.pp +++ b/bigtop_toolchain/manifests/groovy.pp @@ -15,24 +15,27 @@ class bigtop_toolchain::groovy { + $groovy_version = '2.4.4' + $groovy = "apache-groovy-binary-${groovy_version}" + include bigtop_toolchain::packages - exec {"/usr/bin/wget http://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.4.zip": + exec {"/usr/bin/wget http://dl.bintray.com/groovy/maven/${groovy}.zip": cwd => "/usr/src", require => Package[$packages::pkgs], - unless => "/usr/bin/test -f /usr/src/apache-groovy-binary-2.4.4.zip", + unless => "/usr/bin/test -f /usr/src/${groovy}.zip", } - exec {'/usr/bin/unzip -x -o /usr/src/apache-groovy-binary-2.4.4.zip': + exec {"/usr/bin/unzip -x -o /usr/src/${groovy}.zip": cwd => '/usr/local', refreshonly => true, - subscribe => Exec["/usr/bin/wget http://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.4.zip";], - require => Exec["/usr/bin/wget http://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.4.zip";], + subscribe => Exec["/usr/bin/wget http://dl.bintray.com/groovy/maven/${groovy}.zip";], + require => Exec["/usr/bin/wget http://dl.bintray.com/groovy/maven/${groovy}.zip";], } file {'/usr/local/groovy': ensure => link, - target => '/usr/local/groovy-2.4.4', - require => Exec['/usr/bin/unzip -x -o /usr/src/apache-groovy-binary-2.4.4.zip'], + target => "/usr/local/groovy-${groovy_version}", + require => Exec["/usr/bin/unzip -x -o /usr/src/${groovy}.zip"], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0ee641d7/bigtop_toolchain/manifests/maven.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/maven.pp b/bigtop_toolchain/manifests/maven.pp index 8bc02a4..a1d7142 100644 --- a/bigtop_toolchain/manifests/maven.pp +++ b/bigtop_toolchain/manifests/maven.pp @@ -32,7 +32,7 @@ class bigtop_toolchain::maven { file {'/usr/local/maven': ensure => link, - target => "/usr/local/apache-maven-$mvnversion", + target => "/usr/local/$mvn", require => Exec["/bin/tar xvzf /usr/src/$mvn-bin.tar.gz"], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0ee641d7/bigtop_toolchain/manifests/vagrant.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/vagrant.pp b/bigtop_toolchain/manifests/vagrant.pp index 07f9ae6..93fd03a 100644 --- a/bigtop_toolchain/manifests/vagrant.pp +++ b/bigtop_toolchain/manifests/vagrant.pp @@ -15,16 +15,19 @@ class bigtop_toolchain::vagrant { + $vagrant_version = '1.7.1_x86_64' + $vagrant = "vagrant_${vagrant_version}" + case $operatingsystem{ /Ubuntu|Debian/: { exec {'download-vagrant': - command => '/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb', + command => "/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/${vagrant}.deb";, cwd => '/usr/src', - creates => '/usr/src/vagrant_1.7.1_x86_64.deb' + creates => "/usr/src/${vagrant}.deb" } package { 'vagrant': ensure => 'latest', - source => '/usr/src/vagrant_1.7.1_x86_64.deb', + source => "/usr/src/${vagrant}.deb", provider => 'dpkg', require => Exec['download-vagrant'] } @@ -32,7 +35,7 @@ class bigtop_toolchain::vagrant { default : { package { 'vagrant': ensure => 'latest', - source => 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.rpm', + source => "https://dl.bintray.com/mitchellh/vagrant/${vagrant}.rpm";, provider => 'rpm' } }
