From 52e9184de4a647af1ee8ae571611db2e43300619 Mon Sep 17 00:00:00 2001
From: Giles Hutton <ghutton@redhat.com>
Date: Mon, 13 May 2024 09:15:06 +0100
Subject: [PATCH] exclude ebpf on everything except power

---
 ansible/group_vars/all.yml             | 13 +------------
 ansible/roles/create-vm/tasks/main.yml |  4 ++--
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 0c780d6c258..b22874e8aca 100644
--- 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
index 62f0ee43583..a9dec552523 100644
--- 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