Let the test suite install OpenSCAP packages

uyuni-project · Nov 22, 2020 · 26d8239 · 26d8239
1 parent a1b9099
commit 26d8239
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/salt/client/testsuite.sls b/salt/client/testsuite.sls
@@ -9,22 +9,17 @@ client_cucumber_requisites:
     - pkgs:
       - spacewalk-client-setup
       - spacewalk-check
-      - spacewalk-oscap
-      - openscap-utils
       - mgr-cfg-actions
       - wget
     - require:
       - sls: default
 
-{% if grains['os'] == 'SUSE' %}
+{% if grains['os'] == 'SUSE' and '12' in grains['osrelease'] %}
 
 suse_client_cucumber_requisites:
   pkg.installed:
     - pkgs:
-      - openscap-content
-      {% if '12' in grains['osrelease'] %}
       - aaa_base-extras
-      {% endif %}
     - require:
       - sls: repos
 

diff --git a/salt/minion/testsuite.sls b/salt/minion/testsuite.sls
@@ -8,32 +8,21 @@ minion_cucumber_requisites:
   pkg.installed:
     - pkgs:
       - salt-minion
-      {%- if grains['os'] == 'Ubuntu' %}
-      {%- if grains['osrelease'] > '16.04' %}
-      - libopenscap8
-      - ssg-debderived
-      {% endif %}
-      {% else %}
-      - openscap-utils
-      {% endif %}
       - wget
     - require:
       - sls: default
 
 {% if grains['os'] == 'SUSE' %}
+{% if '12' in grains['osrelease'] or '15' in grains['osrelease']%}
 
 suse_minion_cucumber_requisites:
   pkg.installed:
     - pkgs:
-      - openscap-content
-      {% if '12' in grains['osrelease'] or '15' in grains['osrelease']%}
       - aaa_base-extras
       - ca-certificates
-      {% endif %}
     - require:
       - sls: repos
 
-{% if '12' in grains['osrelease'] or '15' in grains['osrelease'] %}
 registry_certificate:
   file.managed:
     - name: /etc/pki/trust/anchors/registry.mgr.suse.de.pem