openstack/project-config
Code Issues Proposed changes

Fix release jobs to work with prepare-workspace-git

Browse Source 
The prepare-workspace-git role recently replaced the use-cached-repos
role, but its behavior is slightly different. While use-cached-repos
removed the 'origin' remote, prepare-workspace-git replaces it with a
zuul fake origin.

Release jobs used to add an 'origin' remote to enable notes fetching.
Those jobs now fail because the 'origin' remote already exists. We
fix this by resetting the URL for the 'origin' remote, instead of
adding a new one.

Change-Id: Ifa80ff02dd06a65fd60189c97438554fc4100932
This commit is contained in:
Thierry Carrez 2019-10-21 13:58:14 +02:00
parent 1d2956dd6d
commit 50c3fb9f59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/release/pre.yaml
View File

@ -1,12 +1,12 @@
- hosts: all - hosts: all
pre_tasks: pre_tasks:
# This is tempoarary until v2 is gone and we can rework things # This is tempoarary until v2 is gone and we can rework things
- name: Add origin remote to enable notes fetching - name: Update origin remote to enable notes fetching
command: "git remote add origin https://{{ item.canonical_name }}" command: "git remote set-url origin https://{{ item.canonical_name }}"
args: args:
chdir: "{{ ansible_user_dir }}/src/{{ item.canonical_name }}" chdir: "{{ ansible_user_dir }}/src/{{ item.canonical_name }}"
with_items: "{{ zuul.projects.values() | list }}" with_items: "{{ zuul.projects.values() | list }}"
# ANSIBLE0006: git remote add is not supported by ansible module # ANSIBLE0006: git remote is not supported by ansible module
tags: tags:
- skip_ansible_lint - skip_ansible_lint
roles: roles: