Fix typo in pyyaml installation

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I2173127ce33b28c36bcae60ae938aaa154b913e6

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index d1bf001..da33fd5 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 # vim: sw=2 ts=2 sts=2 et :
-
+set -e
 set -x
 
 sudo su -c "echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until"
 
-
 sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com 8B48AD6246925553 || true
 
 # go
@@ -42,7 +41,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
 
 DEBIAN_FRONTEND=noninteractive apt-get clean
 
-DEBIAN_FRONTEND=noninteractive apt-get install linux-image-4.15.0-123-generic
+DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic
 
 DEBIAN_FRONTEND=noninteractive apt full-upgrade
 
@@ -57,7 +56,8 @@ DEBIAN_FRONTEND=noninteractive apt full-upgrade
 #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
+sudo pip3 install --upgrade --force-reinstall --ignore-installed pyyaml
+sudo pip3 install --upgrade --ignore-installed --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
@@ -131,12 +131,11 @@ sudo pip3 install --force-reinstall --ignore-installed jinja2
 sudo pip3 install --upgrade jinja2
 
 # updates for cloud-init
-pip3 install --upgrade oauthlib
-pip3 install --upgrade configobj>=5.0.2
-pip3 install --upgrade pyyaml
-pip3 install --upgrade requests
-pip3 install --upgrade jsonschema
-pip3 install --upgrade jsonpatch
+sudo pip3 install --upgrade oauthlib
+sudo pip3 install --upgrade configobj>=5.0.2
+sudo pip3 install --upgrade requests
+sudo pip3 install --upgrade jsonschema
+sudo pip3 install --upgrade jsonpatch
 
 python -c "import sys; print sys.path"
 
@@ -186,5 +185,6 @@ chmod 0600 /home/jenkins/.ssh/authorized_keys
 echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
 chown -R jenkins:jenkins /home/jenkins/.ssh /w
 
+sudo chown -R ubuntu:ubuntu /home/ubuntu 
 
 exit 0

diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh
index f4d4f2b..f6a0eeb 100644 (file)
--- a/packer/provision/agl_hwtest_dependencies.sh
+++ b/packer/provision/agl_hwtest_dependencies.sh
@@ -46,7 +46,7 @@ DEBIAN_FRONTEND=noninteractive apt full-upgrade
 #DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli
 
 sudo pip3 install --upgrade pip
-sudo pip3 install --upreade --ignore-installed PyYAML
+sudo pip3 install --upgrade --force-reinstall --ignore-installed PyYAML
 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
@@ -130,7 +130,8 @@ chmod 0600 /home/jenkins/.ssh/authorized_keys
 
 # Generate ssh key for use by Robot jobs
 echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
-chown -R jenkins:jenkins /home/jenkins/.ssh /w
+sudo chown -R jenkins:jenkins /home/jenkins/.ssh /w
 
+sudo chown -R ubuntu:ubuntu /home/ubuntu/
 
 exit 0