Update default tarball->RPM build param to Carbon

[releng/builder.git] / jjb / packaging / include-raw-test-ansible-deb.sh

diff --git a/jjb/packaging/include-raw-test-ansible-deb.sh b/jjb/packaging/include-raw-test-ansible-deb.sh
index 8f08eb5b6cbbd76b4456e1df90fa1eb9baf8bc81..885139e8ca572f0fbb6aaa906a9404ce06486f3e 100644 (file)
--- a/jjb/packaging/include-raw-test-ansible-deb.sh
+++ b/jjb/packaging/include-raw-test-ansible-deb.sh
@@ -9,7 +9,13 @@ set -ex -o pipefail
 # Install required packages
 virtualenv deb_build
 source deb_build/bin/activate
-pip install --upgrade pip
+PYTHON="deb_build/bin/python"
+$PYTHON -m pip install --upgrade pip
+
+# 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 latest ansible
 sudo apt-add-repository ppa:ansible/ansible
@@ -21,4 +27,4 @@ cd ansible-opendaylight
 sudo ansible-galaxy install -r requirements.yml
 sudo ansible-playbook -i "localhost," -c local examples/deb_repo_install_playbook.yml
 
-# Add more tests
\ No newline at end of file
+# Add more tests