Install dependencies required for building debs

Bake the dependencies into a package image.

Change-Id: I9095b0943cede8dd969ff4f2b097fd02c1560e9f
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/packaging/include-raw-build-deb.sh b/jjb/packaging/include-raw-build-deb.sh
index 0624a3bc78f90a9dd27448b729146371a7229e7b..856c8b3229764977dac2d87fc27628214a6f3a14 100644 (file)
--- a/jjb/packaging/include-raw-build-deb.sh
+++ b/jjb/packaging/include-raw-build-deb.sh
@@ -6,21 +6,6 @@
 #   -o pipefail: Fail on errors in scripts this calls, give stacktrace
 set -ex -o pipefail
 
-# Wait for any background apt processes to finish
-# There seems to be a backgroud apt process that locks /var/lib/dpkg/lock
-# and causes our apt commands to fail.
-while pgrep apt > /dev/null; do sleep 1; done
-
-# Install required packages
-sudo apt-get install -y --force-yes \
-                    build-essential \
-                    devscripts \
-                    equivs \
-                    dh-systemd \
-                    python-yaml \
-                    python-jinja2 \
-                    gdebi
-
 # Build release specified by build params
 "$WORKSPACE/packaging/deb/build.py" --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 9ea019b1e5981d330bffffecb200adc726256614..343f61756b715d600b9358d065e2a513ba34bdec 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -345,6 +345,11 @@ EOF
     echo '---> Disabling automatic daily upgrades'
     sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodic
     echo 'APT::Periodic::Unattended-Upgrade "0";' >> /etc/apt/apt.conf.d/10periodic
+
+    # Install packaging job dependencies for building debs
+    ensure_ubuntu_install  build-essential devscripts equivs dh-systemd python-yaml \
+                    python-jinja2 gdebi
+
 }
 
 all_systems() {