try to fix config for debian 11

spring · Dec 19, 2020 · 08c1cb2 · 08c1cb2
1 parent c4554b4
commit 08c1cb2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/scripts/cfg/etc/apt/sources.list b/scripts/cfg/etc/apt/sources.list
@@ -1,4 +1,4 @@
-deb http://ftp.tu-chemnitz.de/debian/ buster contrib main non-free
-deb http://ftp.tu-chemnitz.de/debian/ buster-updates contrib main non-free
-deb http://deb.debian.org/debian-security/ buster/updates main
+deb http://ftp.tu-chemnitz.de/debian/ bullseye contrib main non-free
+deb http://ftp.tu-chemnitz.de/debian/ bullseye-updates contrib main non-free
+#deb http://deb.debian.org/debian-security/ bullseye/updates main
 
diff --git a/scripts/cfg/etc/default/buildbot-worker b/scripts/cfg/etc/default/buildbot-worker
@@ -0,0 +1,9 @@
+WORKER_RUNNER=/usr/bin/buildslave
+
+WORKER_ENABLED[1]=1
+WORKER_NAME[1]="buildslave #1"
+WORKER_USER[1]="buildbot"
+WORKER_BASEDIR[1]="/home/buildbot"
+WORKER_OPTIONS[1]=""
+WORKER_PREFIXCMD[1]=""
+
diff --git a/scripts/cfg/etc/default/buildslave b/scripts/cfg/etc/default/buildslave
diff --git a/scripts/cfg/install/install-linux.sh b/scripts/cfg/install/install-linux.sh
@@ -14,6 +14,6 @@ apt -y install g++ make cmake p7zip-full ninja-build \
 	autossh \
 	libboost-test-dev \
 	chrpath \
-	wget
+	wget \
+	git
 
-apt -y remove snapd
diff --git a/scripts/cfg/install/setup-auth.sh b/scripts/cfg/install/setup-auth.sh
@@ -3,7 +3,8 @@
 set -e
 
 BUILDBOTDIR=/home/buildbot
-BUILDSLAVECFG=$BUILDBOTDIR/buildbot.tac
+CONFIGDIR=/var/lib/buildbot/workers/spring
+BUILDSLAVECFG=$CONFIGDIR/buildbot.tac
 
 usermod -d "$BUILDBOTDIR" buildbot
 
@@ -16,7 +17,7 @@ if [ -s $BUILDSLAVECFG ]; then
 	PASSWORD=$(grep "passwd =" $BUILDSLAVECFG)
 else
 	PASSWORD=$(pwgen 64 1)
-	buildbot-worker create-worker "$BUILDBOTDIR" localhost:9999 "$HOSTNAME" "$PASSWORD"
+	buildbot-worker create-worker "$CONFIGDIR" localhost:9999 "$HOSTNAME" "$PASSWORD"
 fi
 
 if ! [ -s "$BUILDBOTDIR/.ssh/id_rsa" ]; then
@@ -27,8 +28,9 @@ chmod 700 "$BUILDBOTDIR/.ssh"
 chown -R buildbot:buildbot $BUILDBOTDIR
 
 systemctl enable /etc/systemd/system/autossh.service
+systemctl enable buildbot-worker@spring.service
 
-echo "Public key:"
+echo -n "Public key: ssh-rsa "
 cat "$BUILDBOTDIR/.ssh/id_rsa.pub"
 echo "buildslave username: $HOSTNAME password: $PASSWORD"
 
diff --git a/scripts/setup-buildslaves.sh b/scripts/setup-buildslaves.sh
@@ -56,7 +56,7 @@ for arch in $ARCHITECTURES; do
 	lxc-attach --name $b -- rm -rf /home/buildbot/lib/tmp /home/buildbot/lib/download /install
 	lxc-attach --name $b -- systemctl daemon-reload
 	lxc-attach --name $b -- systemctl start autossh
-	lxc-attach --name $b -- systemctl start buildslave
+	lxc-attach --name $b -- systemctl start buildbot-worker@spring
 	lxc-attach --name $b -- chown -R buildbot:buildbot /home/buildbot
 done