From 40243d2f47cc7c49d968a7ce5bdcc79c522ce3fa Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Oct 25 2019 09:01:20 +0000 Subject: Simplify mock-srpm-build role --- diff --git a/roles/mock-srpm-build/tasks/main.yaml b/roles/mock-srpm-build/tasks/main.yaml index 02b8196..162d80d 100644 --- a/roles/mock-srpm-build/tasks/main.yaml +++ b/roles/mock-srpm-build/tasks/main.yaml @@ -9,18 +9,13 @@ command: usermod -a -G mock {{ ansible_user_id }} become: true -- name: Ensure SOURCES directory - file: - path: "{{ ansible_user_dir }}/SOURCES" - state: directory - - name: Set mock options fact set_fact: mock_opts: "-v -r {{ mock_config }} --resultdir {{ ansible_user_dir }}/repo" -- name: Retrieve sources +- name: Retrieve URL sources shell: > - spectool -g -C {{ ansible_user_dir }}/SOURCES + spectool -g -C {{ ansible_user_dir }}/{{ zuul.project.src_dir }} {{ ansible_user_dir }}/{{ zuul.project.src_dir }}/*.spec - name: Init the mock chroot @@ -30,7 +25,7 @@ shell: > mock {{ mock_opts }} --buildsrpm --spec {{ ansible_user_dir }}/{{ zuul.project.src_dir }}/*.spec - --sources {{ ansible_user_dir }}/SOURCES + --sources {{ ansible_user_dir }}/{{ zuul.project.src_dir }} - name: Rename log file with srpm prefix command: |