From 029d93a23e187429257e1f33eb2cf57861c05cef Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Dec 15 2020 15:47:51 +0000 Subject: Allow to specify extra koji cmd args --- diff --git a/roles/koji-build/defaults/main.yaml b/roles/koji-build/defaults/main.yaml index df79ce0..745e1ba 100644 --- a/roles/koji-build/defaults/main.yaml +++ b/roles/koji-build/defaults/main.yaml @@ -1,3 +1,4 @@ koji_cmd: koji +koji_extra_args: "" scratch_build: True target: rawhide diff --git a/roles/koji-build/tasks/main.yaml b/roles/koji-build/tasks/main.yaml index ef7fcfe..f89528f 100644 --- a/roles/koji-build/tasks/main.yaml +++ b/roles/koji-build/tasks/main.yaml @@ -11,7 +11,7 @@ - name: Build package in koji command: | - {{ koji_cmd }} build {% if scratch_build %} --scratch {% endif %} {{ target }} --wait {{ srpm }} + {{ koji_cmd }} {{ koji_extra_args }} build {% if scratch_build %} --scratch {% endif %} {{ target }} --wait {{ srpm }} register: koji_build failed_when: - koji_build is failure or @@ -29,7 +29,7 @@ - name: Download artifacts from Koji command: | - {{ koji_cmd }} download-task --logs {{ task_id }} + {{ koji_cmd }} {{ koji_extra_args }} download-task --logs {{ task_id }} args: chdir: "{{ ansible_user_dir }}/repo" diff --git a/roles/koji-conf/defaults/main.yaml b/roles/koji-conf/defaults/main.yaml new file mode 100644 index 0000000..02ca70e --- /dev/null +++ b/roles/koji-conf/defaults/main.yaml @@ -0,0 +1,2 @@ +koji_cmd: koji +koji_extra_args: "" diff --git a/roles/koji-conf/tasks/main.yaml b/roles/koji-conf/tasks/main.yaml index bedd020..896f724 100644 --- a/roles/koji-conf/tasks/main.yaml +++ b/roles/koji-conf/tasks/main.yaml @@ -14,4 +14,4 @@ shell: "cat {{ ansible_env.HOME }}/.koji.b64 | base64 -d | tar -xzf - -C {{ ansible_env.HOME }}/" - name: Validate API access - command: koji moshimoshi + command: "{{ koji_cmd }} {{ koji_extra_args }} moshimoshi"