From 4611fd72324667ccbe70ec26fbfbb7f581ca75f6 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jun 23 2021 10:33:03 +0000 Subject: [PATCH 1/2] rpminspect: enable capability to deactivate freshclam --- diff --git a/roles/rpminspect/defaults/main.yaml b/roles/rpminspect/defaults/main.yaml index ce3df06..8b18258 100644 --- a/roles/rpminspect/defaults/main.yaml +++ b/roles/rpminspect/defaults/main.yaml @@ -10,3 +10,4 @@ check_previous_build_enabled: false validate_cert: true arches: x86_64,noarch,src workdir: /var/tmp/rpminspect +freshclam: true diff --git a/roles/rpminspect/tasks/main.yaml b/roles/rpminspect/tasks/main.yaml index db22e11..f8f9e29 100644 --- a/roles/rpminspect/tasks/main.yaml +++ b/roles/rpminspect/tasks/main.yaml @@ -23,6 +23,8 @@ command: "freshclam" become: true ignore_errors: yes + when: + - "{{ freshclam | default(true) }}" - block: - name: Discover package name from specfile name From 6390bb4ba7aada4fe9f1e4e41461a9882432925d Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Jun 23 2021 12:38:24 +0000 Subject: [PATCH 2/2] rpminspect: add rpminspect_opts var For instance, give ability to disable inspections with '-E'. --- diff --git a/roles/rpminspect/defaults/main.yaml b/roles/rpminspect/defaults/main.yaml index 8b18258..6500c43 100644 --- a/roles/rpminspect/defaults/main.yaml +++ b/roles/rpminspect/defaults/main.yaml @@ -2,6 +2,7 @@ target: rawhide koji_cmd: koji rpminspect_cmd: rpminspect +rpminspect_opts: "" rpminspect_data_pkg: rpminspect-data-fedora # If set to true a valid koji client config must be stored in {{ ansible_user_dir }}/koji.conf use_alternate_koji_config: false diff --git a/roles/rpminspect/tasks/main.yaml b/roles/rpminspect/tasks/main.yaml index f8f9e29..7a5ebeb 100644 --- a/roles/rpminspect/tasks/main.yaml +++ b/roles/rpminspect/tasks/main.yaml @@ -81,7 +81,7 @@ - name: Run rpminspect command: | - {{ rpminspect_cmd }} -Dv -k -t BAD -a {{ arches }} -o {{ zuul_output_dir }}/logs/result.json -F json + {{ rpminspect_cmd }} {{ rpminspect_opts }} -Dv -k -t BAD -a {{ arches }} -o {{ zuul_output_dir }}/logs/result.json -F json {{ previous_build_path }} {{ workdir }}/{{ baserpmname }} args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"