diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2021-02-16 20:21:58 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2021-02-16 20:21:58 +0100 |
| commit | 1bad2e65d3beab61e7e4a862105df937ea3a278b (patch) | |
| tree | b77769b586c614d87b096d0899d13b3f90eabad2 | |
| parent | c5eb19673218e6032f2772a56b198a257d024a46 (diff) | |
Enforce version of lavacli
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I9ec73c8414ea10673b6883179297a1c1f6a923bd
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 5 | ||||
| -rw-r--r-- | packer/provision/agl_hwtest_dependencies.sh | 5 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index 67b0f9b9..d1bf0010 100644 --- 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 b8bddf52..41f79c77 100644 --- 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 45568d3b..7b8746d8 100644 --- 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 } |