Merge lp:~verterok/ols-jenkaas/fix-seed-slave into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Guillermo Gonzalez]

Fix seed-slave script

Remove double [[ ]] usage and fix jenkins home

[Shane M. Pelletier (shanepelletier)]

LGTM, thanks!

review: Approve

=== modified file 'jobs/ols-jenkaas.yaml'
--- jobs/ols-jenkaas.yaml	2021-03-01 20:44:22 +0000
+++ jobs/ols-jenkaas.yaml	2023-10-23 20:47:18 +0000
@@ -21,8 +21,7 @@
     description: 'Seed {slave} so it can use branches'
     project-type: freestyle
     node: '{slave}'
-    # We want to run in the home dir, avoid creating an unused workspace
-    workspace: /home/jenkins
+    workspace: /var/lib/jenkins
     builders:
       # Get the jenkaas branch. It has to be public as no ssh key is
       # available at that point.
@@ -46,8 +45,7 @@
     description: 'Update {slave} for packages and code'
     project-type: freestyle
     node: '{slave}'
-    # We want to run in the home dir, avoid creating an unused workspace
-    workspace: /home/jenkins
+    workspace: /var/lib/jenkins
     builders:
       - shell: annotate-output ~/jenkaas/slave/update
 

=== modified file 'setup/seed-slave'
--- setup/seed-slave	2023-03-10 20:11:21 +0000
+++ setup/seed-slave	2023-10-23 20:47:18 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # Use the dirname directly, without changing directories
-if [[ $BASH_SOURCE = */* ]]; then
+if [ $BASH_SOURCE = */* ]; then
     DIRNAME=${BASH_SOURCE%/*}/
 else
     DIRNAME=./
@@ -30,7 +30,7 @@
 PKGS="$PKGS haveged python-ols-config python-ols-vms python3-ols-vms bzr-olsvms devscripts"
 # packages for docker support
 PKGS="$PKGS python-codetree docker.io docker-compose"
-if [[ "$UBUNTU_CODENAME" == "xenial" ]]
+if [ "$UBUNTU_CODENAME" == "xenial" ]
 then
     PKGS="$PKGS config-manager"
 fi