[buildbot] ci: fix worker startup issue by adding missing env vars and cleanup unused vars

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 26 14:28:44 PDT 2024


ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/ff521bb87e49b3a25dc09caad712ae43ad6bf76d

commit ff521bb87e49b3a25dc09caad712ae43ad6bf76d
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Sep 26 21:14:37 2024 +0000

    ci: fix worker startup issue by adding missing env vars and cleanup unused vars
    
    Workers are currently refusing to work:
    
      Unhandled Error
      Traceback (most recent call last):
        File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 673, in run
          runApp(config)
        File "/opt/venv/lib/python3.11/site-packages/twisted/scripts/twistd.py", line 29, in runApp
          runner.run()
        File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 370, in run
          self.application = self.createOrGetApplication()
        File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 437, in createOrGetApplication
          application = getApplication(self.config, passphrase)
      --- <exception caught here> ---
        File "/opt/venv/lib/python3.11/site-packages/twisted/application/app.py", line 446, in getApplication
          application = service.loadApplication(filename, style, passphrase)
        File "/opt/venv/lib/python3.11/site-packages/twisted/application/service.py", line 404, in loadApplication
          application = sob.loadValueFromFile(filename, "application")
        File "/opt/venv/lib/python3.11/site-packages/twisted/persisted/sob.py", line 174, in loadValueFromFile
          codeObj = compile(data, filename, "exec")
      builtins.SyntaxError: keyword argument repeated: connection_string (buildbot.tac, line 49)
    
    and we're not aware about it, so lets fix it by adding the same
    environment variables we're actually using in production.
    
    While at it, cleanup the unused container_verify_string variables.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .github/workflows/build-push.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index d74acaf..fa4993c 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -59,10 +59,8 @@ jobs:
       matrix:
         include:
           - container_flavor: master
-            container_verify_string: "buildmaster configured in /master"
           - container_flavor: worker
-            container_test_command: "--env BUILDWORKER_NAME=X --env BUILDWORKER_PASSWORD=Y"
-            container_verify_string: "worker configured in /builder"
+            container_test_command: "--env BUILDWORKER_TLS=1 --env BUILDWORKER_MASTER=Z:1922 --env BUILDWORKER_NAME=X --env BUILDWORKER_PASSWORD=Y"
 
     steps:
       - name: Checkout




More information about the lede-commits mailing list