Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buildworker: start: fix worker startup failure after update #50

Merged
merged 2 commits into from
Sep 26, 2024

Commits on Sep 26, 2024

  1. ci: fix worker startup issue by adding missing env vars and cleanup u…

    …nused 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 <[email protected]>
    ynezz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ff521bb View commit details
    Browse the repository at this point in the history
  2. buildworker: start: fix worker startup failure after update

    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)
    
    as the buildbot.tac template changed in commit 4ba1dcb66155 ("worker:
    Add option --connection-string for create-worker") and in version v3.10.0.
    
    So lets use this new `--connection-string` feature and get rid of the
    sed-fu.
    
    Fixes: efbddc9 ("Bump buildbot to v3.11.1 release")
    Signed-off-by: Petr Štetiar <[email protected]>
    ynezz committed Sep 26, 2024
    2 Configuration menu
    Copy the full SHA
    3812ff7 View commit details
    Browse the repository at this point in the history