From ba1c19e95c5963dfded26bd381aecc7dc323b303 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 14 2020 08:46:27 +0000
Subject: Properly set facts as templating in vars does not work


---

diff --git a/playbooks/rpm/mock-build-source.yaml b/playbooks/rpm/mock-build-source.yaml
deleted file mode 100644
index 681843e..0000000
--- a/playbooks/rpm/mock-build-source.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- hosts: all
-  vars:
-    project_deps_to_build: "{{ zuul.projects.values() | list | json_query('[?required]') }}"
-    project_to_build:
-      - "{{ zuul.project }}"
-    build_from_source: "{{ build_from_source | default(false) }}"
-    version_from_specfile: "{{ version_from_specfile | default(false) }}"
-    srpms: []
-  tasks:
-    - include_role:
-        name: ensure-mock
-
-    - include_role:
-        name: filter-artifacts
-      when: zuul.artifacts is defined
-
-    - include_role:
-        name: source-to-tarball
-      vars:
-        zuul:
-          project: "{{ item }}"
-      loop: "{{ project_deps_to_build | union(project_to_build) }}"
-      when: build_from_source
-
-    - include_role:
-        name: mock-srpm-build
-      vars:
-        zuul:
-          project: "{{ item }}"
-      loop: "{{ project_deps_to_build | union(project_to_build) }}"
-
-    - include_role:
-        name: mock-build
-      vars:
-        srpm: "{{ item }}"
-      loop: "{{ srpms }}"
diff --git a/playbooks/rpm/mock-build.yaml b/playbooks/rpm/mock-build.yaml
index 83c4852..7c0b8a8 100644
--- a/playbooks/rpm/mock-build.yaml
+++ b/playbooks/rpm/mock-build.yaml
@@ -1,17 +1,17 @@
 - hosts: all
-  vars:
-    project_deps_to_build: "{{ zuul.projects.values() | list | json_query('[?required]') }}"
-    project_to_build:
-      - "{{ zuul.project }}"
-    build_from_source: "{{ build_from_source | default(false) }}"
-    version_from_specfile: "{{ version_from_specfile | default(false) }}"
-    srpms: []
   tasks:
+    - set_fact:
+        project_deps_to_build: "{{ zuul.projects.values() | list | json_query('[?required]') }}"
+        project_to_build:
+          - "{{ zuul.project }}"
+        srpms: []
+
     - include_role:
         name: ensure-mock
 
     - include_role:
         name: filter-artifacts
+      when: zuul.artifacts is defined
 
     - include_role:
         name: source-to-tarball
@@ -19,7 +19,7 @@
         zuul:
           project: "{{ item }}"
       loop: "{{ project_deps_to_build | union(project_to_build) }}"
-      when: build_from_source
+      when: "{{ build_from_source | default(false) }}"
 
     - include_role:
         name: mock-srpm-build