From c8628dd8f846567a3686e428324f4b29b8aa5ed4 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Fri, 20 Oct 2017 17:08:46 +0000 Subject: [PATCH] Revert "Move to dictionary list of projects zuul._projects" This is not working, let's figure it out after a revert. This reverts commit a2767b225aedcf1ea340e1120e41fb6a71bb520a. Change-Id: Ib26e22f6285abfd06f85029a6b283b743c6cbd4a --- playbooks/release/pre.yaml | 2 +- roles/use-cached-repos/tasks/main.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml index d1d5c24c7b..8c23c57e91 100644 --- a/playbooks/release/pre.yaml +++ b/playbooks/release/pre.yaml @@ -6,7 +6,7 @@ command: "git remote add origin https://{{ item.canonical_name }}" args: chdir: "{{ ansible_user_dir }}/src/{{ item.canonical_name }}" - with_items: "{{ zuul._projects.values() }}" + with_items: "{{ zuul.projects }}" roles: - legacy-copy-project-config-scripts diff --git a/roles/use-cached-repos/tasks/main.yaml b/roles/use-cached-repos/tasks/main.yaml index b0251faefc..b5db378da9 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() }}" + with_items: "{{ zuul.projects }}" 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() }}" + - "{{ zuul.projects }}" - "{{ cached_repos.results }}" - name: Clone upstream repo to workspace @@ -19,7 +19,7 @@ creates: "{{ ansible_user_dir }}/{{ item.0.src_dir}}" when: not item.1.stat.exists with_together: - - "{{ zuul.projects.values() }}" + - "{{ zuul.projects }}" - "{{ cached_repos.results }}" - name: Remove origin from local git repos