From 4995f042eadef88a3bd852934ed085fcc222a1c9 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 1 Dec 2017 14:59:29 +1100 Subject: [PATCH] Convert back to zuul.projects Zuul has transitioned zuul.projects to a dict that mirrors zuul._projects. Convert users back to zuul.projects so we can remove the underscore version in zuul. Change-Id: Ib71241a862cf29f6e542dc1d4a2c5cd554d5d7d8 Depends-On: I3c011f72933e98ccbf8badf0e9197c8659766c51 --- playbooks/release/pre.yaml | 2 +- roles/use-cached-repos/tasks/main.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml index 384089ad47..db9b18fa6b 100644 --- a/playbooks/release/pre.yaml +++ b/playbooks/release/pre.yaml @@ -5,7 +5,7 @@ command: "git remote add origin https://{{ item.canonical_name }}" args: 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 tags: - skip_ansible_lint diff --git a/roles/use-cached-repos/tasks/main.yaml b/roles/use-cached-repos/tasks/main.yaml index 40440e6dd6..55ceff0d07 100644 --- a/roles/use-cached-repos/tasks/main.yaml +++ b/roles/use-cached-repos/tasks/main.yaml @@ -1,7 +1,7 @@ - name: Find locally cached git repos stat: path: "/opt/git/{{ item.name }}" - with_items: "{{ zuul._projects.values() | list }}" + with_items: "{{ zuul.projects.values() | list }}" register: cached_repos - name: Clone cached repo to workspace @@ -10,7 +10,7 @@ creates: "{{ ansible_user_dir }}/{{ item.0.src_dir}}" when: item.1.stat.exists with_together: - - "{{ zuul._projects.values() | list }}" + - "{{ zuul.projects.values() | list }}" - "{{ cached_repos.results }}" # ANSIBLE0006: If we use the git module, we get warning # ANSIBLE0004 since we do not give an explicit version @@ -23,7 +23,7 @@ creates: "{{ ansible_user_dir }}/{{ item.0.src_dir}}" when: not item.1.stat.exists with_together: - - "{{ zuul._projects.values() | list }}" + - "{{ zuul.projects.values() | list }}" - "{{ cached_repos.results }}" # ANSIBLE0006: If we use the git module, we get warning # ANSIBLE0004 since we do not give an explicit version @@ -34,7 +34,7 @@ command: "git remote rm origin" args: chdir: "{{ ansible_user_dir }}/{{ item.src_dir}}" - with_items: "{{ zuul._projects.values() | list }}" + with_items: "{{ zuul.projects.values() | list }}" # ANSIBLE0006: git remote is not supported by ansible module tags: - skip_ansible_lint