summaryrefslogtreecommitdiffstats
path: root/vagrant/lib
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/lib
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/lib')
-rw-r--r--vagrant/lib/bootstrap-functions.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/vagrant/lib/bootstrap-functions.sh b/vagrant/lib/bootstrap-functions.sh
index 652160e06..499589fd8 100644
--- a/vagrant/lib/bootstrap-functions.sh
+++ b/vagrant/lib/bootstrap-functions.sh
@@ -153,6 +153,17 @@ deb_reup_certs() {
update-ca-certificates -f
}
+deb_remove_pkgs() {
+ echo '---> Removing unattended-upgrades packge to avoid it locking /var/lib/dpkg/lock'
+ apt-get remove unattended-upgrades
+}
+
+deb_disable_apt_systemd_daily() {
+ echo '---> Stopping and disabling apt.systemd.daily to avoid it locking /var/lib/dpkg/lock'
+ systemctl stop apt.systemd.daily
+ systemctl disable apt.systemd.daily
+}
+
rh_clean_pkgs() {
echo '---> Cleaning caches'
yum clean all -q