Move DISA Alignment 'adjust' and 'extra-hardware' to main.fmf

RHSecurityCompliance · Mar 11, 2024 · 96ed630 · 96ed630
1 parent 85ff7dd
commit 96ed630
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 30 deletions.
diff --git a/scanning/disa-alignment/anaconda.fmf b/scanning/disa-alignment/anaconda.fmf
@@ -4,16 +4,6 @@ result: custom
 environment+:
     PYTHONPATH: ../..
 duration: 1h
-extra-hardware: |
-    keyvalue = HVM=1
-    hostrequire = memory>=3720
-adjust:
-  - when: arch != x86_64
-    enabled: false
-    because: run virtualization on x86_64 only
-  - when: distro == rhel-7
-    enabled: false
-    because: the code is not compatible with RHEL-7
 tag:
   - max1
   - daily
diff --git a/scanning/disa-alignment/ansible.fmf b/scanning/disa-alignment/ansible.fmf
@@ -9,16 +9,6 @@ require+:
   # needed for the ini_file ansible plugin, and more
   - rhc-worker-playbook
 duration: 1h
-extra-hardware: |
-    keyvalue = HVM=1
-    hostrequire = memory>=3720
-adjust:
-  - when: arch != x86_64
-    enabled: false
-    because: run virtualization on x86_64 only
-  - when: distro == rhel-7
-    enabled: false
-    because: the code is not compatible with RHEL-7
 tag:
   - max1
   - daily
diff --git a/scanning/disa-alignment/main.fmf b/scanning/disa-alignment/main.fmf
@@ -10,3 +10,13 @@ require+:
   - virt-install
   - rpm-build
   - createrepo
+extra-hardware: |
+    keyvalue = HVM=1
+    hostrequire = memory>=3720
+adjust:
+  - when: arch != x86_64
+    enabled: false
+    because: run virtualization on x86_64 only
+  - when: distro == rhel-7
+    enabled: false
+    because: the code is not compatible with RHEL-7
diff --git a/scanning/disa-alignment/oscap.fmf b/scanning/disa-alignment/oscap.fmf
@@ -4,16 +4,6 @@ result: custom
 environment+:
     PYTHONPATH: ../..
 duration: 1h
-extra-hardware: |
-    keyvalue = HVM=1
-    hostrequire = memory>=3720
-adjust:
-  - when: arch != x86_64
-    enabled: false
-    because: run virtualization on x86_64 only
-  - when: distro == rhel-7
-    enabled: false
-    because: the code is not compatible with RHEL-7
 tag:
   - max1
   - daily