openstack
/
tripleo-ci
Code Issues Proposed changes

Move qemu-img installation after repo setup 

Move qemu-img after setting up the repos. Nova depends on a version
that conflics with the one installed for setting up images before
deploying.
Moving install after repo ensure we install the version nova would
install as dependency anyway

Change-Id: Iee9a8553abdaeb67816e3242a856108f95fcab4d
Closes-Bug: #1631929
This commit is contained in:
Gabriele Cerami 2016-10-10 18:36:54 +02:00 committed by Ben Nemec
parent 49b00c54cd
commit 369902388f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toci_instack_ovb.sh
View File

@ -24,7 +24,7 @@ hostname | sudo dd of=/etc/hostname
echo "127.0.0.1 $(hostname) $(hostname).openstacklocal" | sudo tee -a /etc/hosts
# TODO: xfsprogs should be a dep of DIB?
sudo yum install -y xfsprogs qemu-img
sudo yum install -y xfsprogs
# Remove the anything on the infra image template that might interfere with CI
sudo yum remove -y puppet hiera puppetlabs-release rdo-release
@ -45,7 +45,7 @@ dummy_ci_repo
$TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --repo-setup
# Install some useful/necessary packages
sudo yum -y install wget python-simplejson yum-plugin-priorities
sudo yum -y install wget python-simplejson yum-plugin-priorities qemu-img
trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci \$exit_val 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT