Add carbon .deb for `packaging-test-deb` job

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

diff --git a/jjb/packaging/include-raw-test-deb.sh b/jjb/packaging/include-raw-test-deb.sh
index 22930fa1713f7b2506a36a7c66ff7c3d50bfc8cc..f5cea65d1c2f91383a3915ac4f59e608309108ca 100644 (file)
--- a/jjb/packaging/include-raw-test-deb.sh
+++ b/jjb/packaging/include-raw-test-deb.sh
@@ -6,13 +6,22 @@
 #   -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 ODL from .deb link or .repo url
-if [[ $URL == *.deb ]]
+if [[ $PACKAGE == *.deb ]]
 then
-  sudo apt-get install -y "$URL"
-elif [[ $URL == ppa:* ]]
+  # shellcheck disable=SC2154
+  pkg_basename="${{PACKAGE##*/}}"
+  # NB: Apt can't install directly from URL, so need this intermediary file
+  curl -L --silent -o "$pkg_basename" "$PACKAGE"
+  sudo dpkg --install ./"$pkg_basename"
+elif [[ $PACKAGE == ppa:* ]]
 then
-  sudo add-apt-repository "$REPO_FILE"
+  sudo add-apt-repository "$PACKAGE"
   sudo apt-get update
   sudo apt-get install -y opendaylight
 else