From aa7577a6468364c76493ed26603b08f95400d375 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Fri, 10 Jun 2022 09:14:34 +0200 Subject: [PATCH] Replace zuul cli command with zuul-admin The zuul cli command is deprecated and creates a warning when it is being used, replace it with zuul-admin. Change-Id: Ifcc891f5da6f16824a65dc8dbf560b5d4c6ee9fc --- 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 29b52fb722..e9ceb1854d 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 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 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 @@ -146,5 +146,5 @@ - include_vars: "{{ repolist }}" - name: Remove old zuul project keys - command: "docker exec zuul-scheduler_scheduler_1 zuul 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 85af64f921..8f0b32b828 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 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: