Fix master and improve CI

.github/workflows/build-push.yml

@@ -83,8 +83,8 @@ jobs:
         run: |
           docker run --detach ${{ matrix.container_test_command }} --name test-${{ matrix.container_flavor }} local/${{ matrix.container_flavor }}
           sleep 5
-          docker logs test-${{ matrix.container_flavor }} | tee ${{ matrix.container_flavor }}.log
-          grep "${{ matrix.container_verify_string }}" ${{ matrix.container_flavor }}.log
+          pip install cram
+          cram --verbose "tests/cram/${{ matrix.container_flavor }}"
 
   deploy:
     name: Push Container

.gitignore

@@ -25,3 +25,5 @@ phase[12]/twistd.*
 !.github/**/*
 !requirements-dev.txt
 !.ruff.toml
+!tests
+!tests/**/*

docker/buildmaster/Dockerfile

@@ -36,6 +36,7 @@ RUN \
 		"buildbot-console-view==$BUILDBOT_VERSION" \
 		"buildbot-grid-view==$BUILDBOT_VERSION" \
 		"buildbot-worker==$BUILDBOT_VERSION" \
+		"twisted==22.10.0" \
 		pyOpenSSL \
 		service_identity
 RUN \

docker/buildmaster/files/entry.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-chown --recursive buildbot:buildbot /master /config /certs
-chmod 0700 /master /config /certs
+for dir in /master /config /certs; do
+  [ -d "$dir" ] || continue 
+
+  chown --recursive buildbot:buildbot "$dir"
+  chmod 0700 "$dir"
+done
 
 /usr/sbin/gosu buildbot /start.sh "$@"

requirements-dev.txt

@@ -1,2 +1,3 @@
+cram==0.7
 black==23.3.0
 ruff==0.0.267

tests/cram/master/01-logs.t

@@ -0,0 +1,7 @@
+Check that logs have expected content after container startup:
+
+  $ docker logs test-master
+  updating existing installation
+  creating /master/master.cfg.sample
+  creating database (sqlite:///state.sqlite)
+  buildmaster configured in /master

tests/cram/worker/01-logs.t

@@ -0,0 +1,10 @@
+Check that logs have expected content after container startup:
+
+  $ docker logs test-worker
+  updating existing installation
+  mkdir /builder/info
+  Creating info/admin, you need to edit it appropriately.
+  Creating info/host, you need to edit it appropriately.
+  Not creating info/access_uri - add it if you wish
+  Please edit the files in /builder/info appropriately.
+  worker configured in /builder