Repository: bigtop Updated Branches: refs/heads/master f436309e1 -> a85426189
BIGTOP-2079: './gradlew toolchain' removes irrelevant files on its cleanup Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a8542618 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a8542618 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a8542618 Branch: refs/heads/master Commit: a8542618967dcba04b6871952e52306ad247971c Parents: f436309 Author: Olaf Flebbe <o...@oflebbe.de> Authored: Sat Oct 10 19:17:10 2015 +0200 Committer: Olaf Flebbe <o...@oflebbe.de> Committed: Tue Oct 13 22:17:42 2015 +0200 ---------------------------------------------------------------------- bigtop_toolchain/manifests/cleanup.pp | 4 ++-- bigtop_toolchain/manifests/vagrant.pp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/a8542618/bigtop_toolchain/manifests/cleanup.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/cleanup.pp b/bigtop_toolchain/manifests/cleanup.pp index 0c742c5..94929e4 100644 --- a/bigtop_toolchain/manifests/cleanup.pp +++ b/bigtop_toolchain/manifests/cleanup.pp @@ -21,8 +21,8 @@ class bigtop_toolchain::cleanup { } exec { 'remove archives': - cwd => '/tmp', - command => '/bin/bash -c "rm -rf /tmp/* ; rm -f /usr/src/* ; exit 0"' + cwd => '/usr/src', + command => '/bin/rm -f *.deb *.zip *.tar.gz' } exec { 'clean packages': http://git-wip-us.apache.org/repos/asf/bigtop/blob/a8542618/bigtop_toolchain/manifests/vagrant.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/vagrant.pp b/bigtop_toolchain/manifests/vagrant.pp index cf17fb6..07f9ae6 100644 --- a/bigtop_toolchain/manifests/vagrant.pp +++ b/bigtop_toolchain/manifests/vagrant.pp @@ -18,12 +18,13 @@ class bigtop_toolchain::vagrant { case $operatingsystem{ /Ubuntu|Debian/: { exec {'download-vagrant': - command => '/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb --output-document /tmp/vagrant_1.7.1_x86_64.deb', - creates => '/tmp/vagrant_1.7.1_x86_64.deb' + command => '/usr/bin/wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb', + cwd => '/usr/src', + creates => '/usr/src/vagrant_1.7.1_x86_64.deb' } package { 'vagrant': ensure => 'latest', - source => '/tmp/vagrant_1.7.1_x86_64.deb', + source => '/usr/src/vagrant_1.7.1_x86_64.deb', provider => 'dpkg', require => Exec['download-vagrant'] }
