summaryrefslogtreecommitdiffstats
path: root/jenkins-scripts
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2017-02-13 11:39:10 -0600
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2017-02-13 15:46:41 -0600
commit48a978996e5af71257b35cfdf1006d1abad09097 (patch)
tree83b315f6f52a0a0a930a54813e8f54c6f45ad3f2 /jenkins-scripts
parent340813fe6c26384e0bf552c44aa50e95a259e30a (diff)
Disable auto updates on Ubuntu
Modifying the disable auto updates on Ubuntu to use perl instead of sed because the sed -ine is creating new files ending in ne. Modifying where the apt-get upgrade and updates occur to resolve dpkg/locks which are causing VPP & NSH_SFC builds to fail. Change-Id: I5a81d72df7b758bd8287c54909386114c33ed730 Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jenkins-scripts')
-rwxr-xr-xjenkins-scripts/basic_settings.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh
index 5701d0b2..09563cd5 100755
--- a/jenkins-scripts/basic_settings.sh
+++ b/jenkins-scripts/basic_settings.sh
@@ -11,11 +11,6 @@
case "$(facter operatingsystem)" in
Ubuntu)
- # catch extra auto-update scripts that were missed in packer
- sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodicne
- sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/20auto-upgrades
-
- apt-get update
# make sure that the ca-certs are properly updated
/usr/sbin/update-ca-certificates
@@ -24,6 +19,7 @@ case "$(facter operatingsystem)" in
# Configure Ubuntu mirror
perl -pi -e 'unless(m{(security|fd\.io)}){ s{://[^/]+/}{://ca.archive.ubuntu.com/} }' /etc/apt/sources.list
+ apt-get update
;;
*)
# Do nothing on other distros for now