From cd328773b0c7e3817e3c8ddd325443d31e20b67b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 3 Nov 2015 14:23:50 -0500 Subject: [PATCH] run_tests: install puppet from puppetlabs.com repo Use puppetlabs.com repositories to handle Puppet packaging, like it's done in Beaker jobs. That way, we will run the latest version available in Puppetlabs repositories, in a consistent way with beaker jobs. Depends-On: Iaba6e499b1185d75930f0e7b0ca587e9f8705e5a Change-Id: I2d49c1e913bbbf243dca3fcf41f592168f46b57b --- run_tests.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index cab736155..096f408f2 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -59,10 +59,14 @@ function uses_debs { } if uses_debs; then + wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb -O /tmp/puppet.deb + $SUDO dpkg -i /tmp/puppet.deb $SUDO apt-get update - $SUDO apt-get install -y dstat + $SUDO apt-get install -y dstat puppet elif is_fedora; then - $SUDO yum install -y dstat + wget https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm -O /tmp/puppet.rpm + $SUDO rpm -ivh /tmp/puppet.rpm + $SUDO yum install -y dstat puppet fi # use dstat to monitor system activity during integration testing