summaryrefslogtreecommitdiffstats
path: root/vagrant/basebuild
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-05-15 12:57:27 -0500
committerEd Warnicke <eaw@cisco.com>2016-05-16 14:30:20 -0500
commit9b3866ff77f39397027517b874df380e0e43af63 (patch)
treeffb04aa3065a6720859e4ba78275e686f6bff444 /vagrant/basebuild
parent185716f4ed503dbc5e57a797948f3746e091483b (diff)
Disable things which may lock /var/lib/dpkg/lock
The ubuntu1604 verify job has been failing due to locking of /var/lib/dpkg/lock: https://lists.fd.io/pipermail/vpp-dev/2016-May/000992.html This appears to only happen with the first job run against a particular Jenkins slave, and upon using: https://gerrit.fd.io/r/#/c/1121/ to probe it, two candidates emerge: apt.systemd.daily and unattended-upgrades So this patch removes unattended-upgrades and stops/disables apt.systemd.daily via systemd Change-Id: Ic2bc9e4ec54ef1f2d0ab35813c4623a67a43f00a Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'vagrant/basebuild')
-rw-r--r--vagrant/basebuild/bootstrap.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/vagrant/basebuild/bootstrap.sh b/vagrant/basebuild/bootstrap.sh
index b3f5426a8..a0bcfb962 100644
--- a/vagrant/basebuild/bootstrap.sh
+++ b/vagrant/basebuild/bootstrap.sh
@@ -25,6 +25,8 @@ then
deb_sync_minor
deb_correct_shell
deb_install_pkgs
+ deb_remove_pkgs
+ deb_disable_apt_systemd_daily
deb_flush
deb_reup_certs