Uprev and fstab

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

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index d8f17fb..6c2088e 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -49,6 +49,8 @@ DEBIAN_FRONTEND=noninteractive apt-get clean
 #DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic
 DEBIAN_FRONTEND=noninteractive apt full-upgrade
 
+DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive
+
 sudo pip3 install --upgrade pip
 sudo pip3 install --upgrade --force-reinstall --ignore-installed pyyaml
 sudo pip3 install --upgrade --ignore-installed --force-reinstall lavacli==1.0
@@ -60,6 +62,7 @@ DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
 
 # add user ubuntu to docker group:
 sudo usermod -a -G docker ubuntu
+sudo usermod -a -G docker jenkins
 
 cat <<EOFHOSTS >> /etc/hosts
 

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index bdc85bf..2d29953 100644 (file)
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -5,15 +5,18 @@
 
 set -x
 
-mkdir -p /srv/tank
-chown -R jenkins:jenkins /srv/tank
+mkdir -p /mnt/tank
+chown -R jenkins:jenkins /mnt/tank
+mkdir -p /mnt/tank2
+chown -R jenkins:jenkins /mnt/tank2
 
 cat <<EOFSTAB >> /etc/fstab
 
 # tmp should be tmpfs so gcc tmpfiles do not hit the disk
 none /tmp tmpfs defaults 0 0
 
-10.30.73.73:/srv/tank /mnt/tank nfs vers=3,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr 0 0
+10.30.73.73:/srv/tank /mnt/tank  nfs vers=3,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr 0 0
+10.30.73.73:/srv/tank /mnt/tank2 nfs vers=3,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr 0 0
 #                                    vers=3,auto,nofail,noatime,nolock,intr,tcp,actimeo=1800
 
 EOFSTAB