diff --git a/files/tasks/zuul-project-setup.yaml b/files/tasks/zuul-project-setup.yaml deleted file mode 100644 index d83f352a..00000000 --- a/files/tasks/zuul-project-setup.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- set_fact: - project_dir: "{{ playbook_dir }}/.." -- set_fact: - project_dir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - when: zuul is defined -- name: stat {{ project_dir }} - stat: - path: "{{ project_dir }}" - tags: - - no-cache - register: src_path -- name: Let's make sure {{ project_dir }} is present - assert: - that: - - "src_path.stat.isdir" diff --git a/files/zuul-install-requirements-rpms.yaml b/files/zuul-install-requirements-rpms.yaml index 1a9743b6..63136ec0 100644 --- 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 index 195f517f..a07cc0b3 100644 --- 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 index 592541fa..3b559c4c 100644 --- 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