exclude ebpf on everything except power

stackrox · May 13, 2024 · 52e9184 · 52e9184
1 parent bea7109
commit 52e9184
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -18,18 +18,7 @@ redhat_password: "{{ lookup('env', 'REDHAT_PASSWORD', default='') }}"
 
 excluded_pairs:
   # e.g. - ['ubuntu-1804-lts', 'core_bpf']
-  # This can be removed once we have downloadable s390x eBPF drivers
-  - [ 'rhel-8-6-s390x', 'ebpf' ]
-  # No ebpf support for arm... Yet...?
-  - [ 'rhel-9-arm64', 'ebpf' ]
-  - [ 'ubuntu-2004-lts-arm64', 'ebpf' ]
-  - [ 'ubuntu-2204-lts-arm64', 'ebpf' ]
-  - [ 'sles-15-arm64', 'ebpf' ]
-  - [ 'fedora-coreos-stable-arm64', 'ebpf' ]
-  # eBPF on Garden Linux is not supported.
-  - [ "{{ lookup('file', 'group_vars/gardenlinux-image.txt') }}", 'ebpf' ]
-
-  - [ 'p', 'ebpf' ]
+  -
 
 virtual_machines:
   rhel:

diff --git a/ansible/roles/create-vm/tasks/main.yml b/ansible/roles/create-vm/tasks/main.yml
@@ -2,12 +2,12 @@
 
 - name: Check family excluded
   set_fact:
-    excluded: "{{ [vm_family, vm_collection_method] in excluded_pairs }}"
+    excluded: "{{ [vm_family, vm_collection_method] in excluded_pairs or (vm_family != 'p' and vm_collection_method == 'ebpf') }}"
   when: vm_image is not defined
 
 - name: Check image excluded
   set_fact:
-    excluded: "{{ [vm_image, vm_collection_method] in excluded_pairs }}"
+    excluded: "{{ [vm_image, vm_collection_method] in excluded_pairs or (vm_family != 'p' and vm_collection_method == 'ebpf') }}"
   when: vm_image is defined
 
 - name: Create IBM Z VM