Enforce version of lavacli

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I9ec73c8414ea10673b6883179297a1c1f6a923bd

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 67b0f9b..d1bf001 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -54,7 +54,10 @@ DEBIAN_FRONTEND=noninteractive apt full-upgrade
 #rm lavasoftware.key.asc
 #sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com A791358F2E49B100
 
-DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y lavacli
+#DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y lavacli
+
+sudo pip3 install --upgrade pip
+sudo pip3 install --upgrade --force-reinstall lavacli==1.0
 
 # we have a build blocker wrt useradd - I assume it is caused by /bin/sh being dash
 # systemd: Performing useradd with

diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh
index b8bddf5..41f79c7 100644 (file)
--- a/packer/provision/agl_hwtest_dependencies.sh
+++ b/packer/provision/agl_hwtest_dependencies.sh
@@ -45,7 +45,8 @@ DEBIAN_FRONTEND=noninteractive apt full-upgrade
 #echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list
 #DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli
 
-pip3 install lavacli
+sudo pip3 install --upgrade pip
+sudo pip3 install --upgrade --force-reinstall lavacli==1.0
 
 # we have a build blocker wrt useradd - I assume it is caused by /bin/sh being dash
 # systemd: Performing useradd with
@@ -59,7 +60,7 @@ DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
 #EOFHOSTS
 
 # install newer version of jjb ... fixes issues with rendering
-sudo pip install --upgrade --force-reinstall -v jenkins-job-builder
+sudo pip3 install --upgrade --force-reinstall -v jenkins-job-builder
 
 cat <<EOFSYSCTL >> /etc/sysctl.conf
 # we have a lot of make jobs, this helps a lot

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 45568d3..7b8746d 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -133,7 +133,7 @@ EOF
 
     # install Java 7
     echo "---> Configuring OpenJDK"
-    apt-get install -y default-jre-headless default-jdk-headless
+    apt-get install -y default-jre-headless default-jdk-headless unzip
 
 }