From 1cf3d16637e0a128c3e12236614cc0cd4f40dfc7 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 28 Jun 2016 15:26:41 +0200 Subject: ship our local copy of phantomjs --- provisioning/modules/phantomjs/files/phantomjs | Bin 0 -> 67932064 bytes provisioning/modules/phantomjs/manifests/init.pp | 25 +++++++---------------- 2 files changed, 7 insertions(+), 18 deletions(-) create mode 100755 provisioning/modules/phantomjs/files/phantomjs diff --git a/provisioning/modules/phantomjs/files/phantomjs b/provisioning/modules/phantomjs/files/phantomjs new file mode 100755 index 00000000..d72e801c Binary files /dev/null and b/provisioning/modules/phantomjs/files/phantomjs differ diff --git a/provisioning/modules/phantomjs/manifests/init.pp b/provisioning/modules/phantomjs/manifests/init.pp index 8a10de81..52500f48 100644 --- a/provisioning/modules/phantomjs/manifests/init.pp +++ b/provisioning/modules/phantomjs/manifests/init.pp @@ -1,22 +1,11 @@ # install phantomjs for unit tests +# we ship our local copy of phantomjs +# because downloading phantomjs fails regularly class phantomjs { - package{['tar','bzip2']:} - - exec{'download_phantomjs': - command => '/usr/bin/wget -O /var/local/phantomjs-2.1.1.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2', - creates => '/var/local/phantomjs-2.1.1.tar.bz2', - notify => Exec['unpack_phantomjs'], - timeout => '0', - } - exec{'unpack_phantomjs': - command => '/bin/tar xvfj phantomjs-2.1.1.tar.bz2', - cwd => '/var/local/', - refreshonly => true, - require => [ Package['tar'], Package['bzip2'] ], - notify => Exec['install_phantomjs'], - } - exec{'install_phantomjs': - command => '/usr/bin/install /var/local/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs', - refreshonly => true, + file{'/usr/local/bin/phantomjs': + source => 'puppet:///modules/phantomjs/phantomjs', + owner => 'root', + group => 'root', + mode => '0755', } } -- cgit v1.2.3