Merge lp:~verterok/ols-jenkaas/bind-mount-and-misc-fixes into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Guillermo Gonzalez]

PS5 redeploy fixes and improvements:
 - fix docker-setup call in setup/seeded-slave and use `lxd waitready` instead of 10s sleep
 - renamed G|UID env variables as these are read-only in bash
 - bind mount /var/lib/jenkins in /home/jenkins and update user home dir to make snapd work

=== modified file 'setup/seed-slave'
--- setup/seed-slave	2023-10-23 21:03:48 +0000
+++ setup/seed-slave	2023-10-25 00:29:30 +0000
@@ -97,6 +97,19 @@
 # allow jenkins to use lxd
 sudo adduser jenkins lxd
 
+# bind mount /var/lib/jenkins to /home/jenkins to make snapd happy 
+if [ ! -f /home/jenkins/.real-dir ]
+then
+    mkdir -p -m 755 /home/jenkins
+    touch /home/jenkins/.real-dir
+    sudo chown jenkins:jenkins /home/jenkins
+    sudo mount -o bind /var/lib/jenkins /home/jenkins
+    echo "/var/lib/jenkins /home/jenkins none defaults,bind 0 0" | sudo tee -a /etc/fstab
+    # update user home, do it manually as 'usermod -d /home/jenkins jenkins' fails
+    sudo sed -i 's#/var/lib/jenkins#//home/jenkins#' /etc/passwd
+    # we need to reboot after this?
+fi
+
 # Force a restart so the lxd/docker group is taken into account
 # We can't use +0min, it's too fast :-/
 echo sudo service jenkins-slave restart | at now+1min

=== modified file 'setup/seeded-slave'
--- setup/seeded-slave	2023-10-24 19:08:43 +0000
+++ setup/seeded-slave	2023-10-25 00:29:30 +0000
@@ -54,9 +54,8 @@
     LXD_INIT_OPTS="--storage-backend zfs --storage-create-loop $POOL_SIZE --storage-pool $POOL"
     sudo rm -rf /var/snap/lxd/common/lxd
     sudo systemctl start snap.lxd.daemon.unix.socket snap.lxd.daemon.service
-    echo "sleeping 10 secs"
-    sleep 10
-    echo "waking up"
+    echo "waiting for lxd to be ready"
+    lxd waitready
 fi
 
 sudo lxd init --auto $LXD_INIT_OPTS
@@ -71,10 +70,10 @@
 lxc network attach-profile lxdbr0 default eth0 --force-local || true
 
 # Ensure lxd mounts can be used
-UID=$(id -u)
-GID=$(id -g)
-sudo usermod --add-subuid $UID-$UID root
-sudo usermod --add-subgid $GID-$GID root
+U_ID=$(id -u)
+G_ID=$(id -g)
+sudo usermod --add-subuid $U_ID-$U_ID root
+sudo usermod --add-subgid $G_ID-$G_ID root
 
 # Ensure containers can be nested
 for user in root lxd; do
@@ -110,7 +109,7 @@
 bzr branch ${JENKAAS_JOBS} ~/jenkaas
 
 # setup docker, in this case is just in case one of the env vars or registry changed
-${DIRNAME}/docker-setup
+~/jenkaas/setup/docker-setup
 
 if [ "${JENKAAS}" = "production" ] ; then
     # jenkaas production slaves use a 1400 MTU, tell lxd to do the same for all