From f63abfa921b2c69e202b068fe631b48adbb9ad64 Mon Sep 17 00:00:00 2001 From: Logan V Date: Thu, 25 Oct 2018 14:56:00 -0500 Subject: [PATCH] Use consistent apt options for upgrades The 'apt-get upgrade' does not set confdef and confold currently, so an upgrade which requires user input can break the cache build[1]. [1] http://paste.openstack.org/raw/733076/ Change-Id: Ic6689387a28539b7eb341d55a9db08f078e8e975 --- templates/prep-scripts/ubuntu_16_prep.sh.j2 | 2 +- templates/prep-scripts/ubuntu_18_prep.sh.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/prep-scripts/ubuntu_16_prep.sh.j2 b/templates/prep-scripts/ubuntu_16_prep.sh.j2 index 524965ff..732c0859 100644 --- a/templates/prep-scripts/ubuntu_16_prep.sh.j2 +++ b/templates/prep-scripts/ubuntu_16_prep.sh.j2 @@ -10,7 +10,7 @@ apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true # Update base distribution apt-get update -apt-get upgrade -y +apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }} apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes rm -f /usr/bin/python diff --git a/templates/prep-scripts/ubuntu_18_prep.sh.j2 b/templates/prep-scripts/ubuntu_18_prep.sh.j2 index 46c93a96..bf7e5a65 100644 --- a/templates/prep-scripts/ubuntu_18_prep.sh.j2 +++ b/templates/prep-scripts/ubuntu_18_prep.sh.j2 @@ -14,7 +14,7 @@ apt-get remove -y --purge snap* lxc* lxd* resolvconf* || true apt-get update apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes gnupg -apt-get upgrade -y +apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }} apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes rm -f /usr/bin/python