Merge pull request #482 from jpopelka/zuul

Remove files/tasks/zuul-project-setup.yaml Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
packit · Oct 14, 2020 · 9fcfb01 · 9fcfb01
2 parents f6af906 + 4b17087
commit 9fcfb01
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/files/tasks/zuul-project-setup.yaml b/files/tasks/zuul-project-setup.yaml
diff --git a/files/zuul-install-requirements-rpms.yaml b/files/zuul-install-requirements-rpms.yaml
@@ -1,8 +1,9 @@
 ---
 - name: Install RPM dependencies for ogr
   hosts: all
+  vars:
+    project_dir: "{{ playbook_dir }}/.."
   tasks:
-    - include_tasks: tasks/zuul-project-setup.yaml
     - include_tasks: tasks/generic-dnf-requirements.yaml
     - include_tasks: tasks/build-rpm-deps.yaml
     - name: Install deps as RPMs

diff --git a/files/zuul-reverse-dep-packit.yaml b/files/zuul-reverse-dep-packit.yaml
@@ -1,10 +1,11 @@
 ---
 - name: Check if we are not breaking packit
   hosts: all
+  vars:
+    project_dir: "{{ playbook_dir }}/.."
   tasks:
     - set_fact:
         reverse_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/packit/packit'].src_dir }}"
-    - include_tasks: tasks/zuul-project-setup.yaml
     - include_tasks: tasks/generic-dnf-requirements.yaml
     - include_tasks: tasks/rpm-test-deps.yaml
     - include_tasks: tasks/packit-requirements.yaml

diff --git a/files/zuul-tests.yaml b/files/zuul-tests.yaml
@@ -1,8 +1,9 @@
 ---
 - name: This is a recipe for how to run ogr tests
   hosts: all
+  vars:
+    project_dir: "{{ playbook_dir }}/.."
   tasks:
-    - include_tasks: tasks/zuul-project-setup.yaml
     - include_tasks: tasks/rpm-test-deps.yaml
     - include_tasks: tasks/install-ogr.yaml
     - include_tasks: tasks/configure-git.yaml