Remove existed checkout before use
avoid fatal error: `destination path 'XXX' already exists`, and prevent package download failure. Change-Id: I5ca84f43304397cb2017131ead6f321787ae09e1 Signed-off-by: guessi <guessi@gmail.com>
This commit is contained in:
parent
aad2dd2624
commit
4ef0ded8a1
17
run_tests.sh
17
run_tests.sh
@ -38,6 +38,9 @@ if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
|
|||||||
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
|
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
|
||||||
git://git.openstack.org openstack/tempest
|
git://git.openstack.org openstack/tempest
|
||||||
else
|
else
|
||||||
|
# remove existed checkout before clone
|
||||||
|
$SUDO rm -rf /tmp/openstack/tempest
|
||||||
|
|
||||||
# We're outside the gate, just do a regular git clone
|
# We're outside the gate, just do a regular git clone
|
||||||
git clone git://git.openstack.org/openstack/tempest /tmp/openstack/tempest
|
git clone git://git.openstack.org/openstack/tempest /tmp/openstack/tempest
|
||||||
fi
|
fi
|
||||||
@ -53,11 +56,21 @@ function run_puppet() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if uses_debs; then
|
if uses_debs; then
|
||||||
|
if dpkg -l puppetlabs-release >/dev/null 2>&1; then
|
||||||
|
$SUDO apt-get purge -y puppetlabs-release
|
||||||
|
fi
|
||||||
|
$SUDO rm -f /tmp/puppet.deb
|
||||||
|
|
||||||
wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb -O /tmp/puppet.deb
|
wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb -O /tmp/puppet.deb
|
||||||
$SUDO dpkg -i /tmp/puppet.deb
|
$SUDO dpkg -i /tmp/puppet.deb
|
||||||
$SUDO apt-get update
|
$SUDO apt-get update
|
||||||
$SUDO apt-get install -y dstat puppet
|
$SUDO apt-get install -y dstat puppet
|
||||||
elif is_fedora; then
|
elif is_fedora; then
|
||||||
|
if rpm --quiet -q puppetlabs-release; then
|
||||||
|
$SUDO rpm -e puppetlabs-release
|
||||||
|
fi
|
||||||
|
$SUDO rm -f /tmp/puppet.rpm
|
||||||
|
|
||||||
wget https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm -O /tmp/puppet.rpm
|
wget https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm -O /tmp/puppet.rpm
|
||||||
$SUDO rpm -ivh /tmp/puppet.rpm
|
$SUDO rpm -ivh /tmp/puppet.rpm
|
||||||
$SUDO yum install -y dstat puppet
|
$SUDO yum install -y dstat puppet
|
||||||
@ -93,6 +106,10 @@ if [ $RESULT -ne 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mkdir -p /tmp/openstack/tempest
|
||||||
|
|
||||||
|
$SUDO rm -f /tmp/openstack/tempest/cirros-0.3.4-x86_64-disk.img
|
||||||
|
|
||||||
# TODO(emilien) later, we should use local image if present. That would be a next iteration.
|
# TODO(emilien) later, we should use local image if present. That would be a next iteration.
|
||||||
wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
|
wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user