opendev/system-config
Code Issues Proposed changes

Replace zuul cli command with zuul-admin

Browse Source 
The zuul cli command is deprecated and creates a warning when it is
being used, replace it with zuul-admin.

Change-Id: Ifcc891f5da6f16824a65dc8dbf560b5d4c6ee9fc
This commit is contained in:
Dr. Jens Harbott 2022-06-10 09:14:34 +02:00
parent 8a90e1af9a
commit aa7577a646
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/rename_repos.yaml
View File

@ -70,10 +70,10 @@
- include_vars: "{{ repolist }}" - include_vars: "{{ repolist }}"
- name: Backup the zuul keys before we modify them - 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 - 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 }}" loop: "{{ repos }}"
- hosts: review - hosts: review
@ -146,5 +146,5 @@
- include_vars: "{{ repolist }}" - include_vars: "{{ repolist }}"
- name: Remove old zuul project keys - 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 }}" loop: "{{ repos }}"

2
playbooks/roles/zuul-scheduler/tasks/main.yaml
View File

@ -56,7 +56,7 @@
hour: 0 hour: 0
# Note we backup to /var/lib/zuul because that is what we have bind # 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 # 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 - name: Install logging config
copy: copy: