openstack/project-config
Code Issues Proposed changes

Merge "Silence distro package install a bit"

Browse Source
This commit is contained in:
Jenkins 2016-03-27 16:01:51 +00:00 committed by Gerrit Code Review
commit 5833076f39
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/scripts/install-distro-packages.sh
View File

@ -37,10 +37,10 @@ until $BINDEP -b -f $PACKAGES ; do
# don't abort inside the loop, we check for the desired outcome # don't abort inside the loop, we check for the desired outcome
set +e set +e
if apt-get -v >/dev/null ; then if apt-get -v >/dev/null 2>&1 ; then
sudo apt-get update sudo apt-get -qq update
sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \ sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
apt-get --option "Dpkg::Options::=--force-confold" \ apt-get -q --option "Dpkg::Options::=--force-confold" \
--assume-yes install `$BINDEP -b -f $PACKAGES` --assume-yes install `$BINDEP -b -f $PACKAGES`
else else
sudo PATH=/usr/sbin:/sbin:$PATH $YUM install -y \ sudo PATH=/usr/sbin:/sbin:$PATH $YUM install -y \