From d2e4ac28720f2828508a7df6aa490bf9754d0eb0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 3 Jul 2025 06:52:40 -0700 Subject: [PATCH] Fix zuul scheduler container name in docker exec commands We use docker exec commands against the zuul scheduler container to do things like backup project keys and rename projects during project renaming. The transition from Jammy with docker-compose to Noble with docker compose resulted in this container being renamed zuul-scheduler_scheduler_1 to zuul-scheduler-scheduler-1. Update the docker exec's to use the new name. Change-Id: I2f1e9802f188ce3c4b0816c1cd1660fe9f4615fd --- playbooks/rename_repos.yaml | 6 +++--- playbooks/roles/zuul-scheduler/tasks/main.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/rename_repos.yaml b/playbooks/rename_repos.yaml index 873eba4870..374fe11d23 100644 --- a/playbooks/rename_repos.yaml +++ b/playbooks/rename_repos.yaml @@ -70,10 +70,10 @@ - include_vars: "{{ repolist }}" - name: Backup the zuul keys before we modify them - command: "docker exec zuul-scheduler_scheduler_1 zuul-admin export-keys /var/lib/zuul/zuul-keys-backup.json" + command: "docker exec zuul-scheduler-scheduler-1 zuul-admin export-keys /var/lib/zuul/zuul-keys-backup.json" - name: Copy zuul keys from old to new project - command: "docker exec zuul-scheduler_scheduler_1 zuul-admin copy-keys gerrit {{ item.old }} gerrit {{ item.new }}" + command: "docker exec zuul-scheduler-scheduler-1 zuul-admin copy-keys gerrit {{ item.old }} gerrit {{ item.new }}" loop: "{{ repos }}" - hosts: review @@ -163,5 +163,5 @@ - include_vars: "{{ repolist }}" - name: Remove old zuul project keys - command: "docker exec zuul-scheduler_scheduler_1 zuul-admin delete-keys gerrit {{ item.old }}" + command: "docker exec zuul-scheduler-scheduler-1 zuul-admin delete-keys gerrit {{ item.old }}" loop: "{{ repos }}" diff --git a/playbooks/roles/zuul-scheduler/tasks/main.yaml b/playbooks/roles/zuul-scheduler/tasks/main.yaml index 8f0b32b828..4c95a88ffd 100644 --- a/playbooks/roles/zuul-scheduler/tasks/main.yaml +++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml @@ -56,7 +56,7 @@ hour: 0 # Note we backup to /var/lib/zuul because that is what we have bind # mounted in the container and we are operating relative to that context - job: docker exec zuul-scheduler_scheduler_1 zuul-admin export-keys /var/lib/zuul/zuul-keys-backup.json + job: docker exec zuul-scheduler-scheduler-1 zuul-admin export-keys /var/lib/zuul/zuul-keys-backup.json - name: Install logging config copy: