From c4cb5505011e6b4ac6ce669865f32f192563f913 Mon Sep 17 00:00:00 2001
From: Tuomas Katila <tuomas.katila@intel.com>
Date: Tue, 23 Apr 2024 18:17:01 +0300
Subject: [PATCH] e2e: use new spr bare metal node

Run IAA, DSA, GPU, QAT and SGX tests on it.

Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
---
 .github/workflows/lib-e2e.yaml | 66 ++++++++++++++++++++--------------
 Makefile                       |  3 ++
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/lib-e2e.yaml b/.github/workflows/lib-e2e.yaml
index 1678243b..f2a5c27c 100644
--- a/.github/workflows/lib-e2e.yaml
+++ b/.github/workflows/lib-e2e.yaml
@@ -11,47 +11,59 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: e2e-dsa-spr
-            targetjob: e2e-dsa
-            runner: simics-spr
-            images: intel-dsa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator
           - name: e2e-dsa-gnr
             targetjob: e2e-dsa
             runner: simics-gnr
-            images: intel-dsa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator
-          - name: e2e-fpga
-            runner: fpga
-            images: intel-fpga-plugin intel-fpga-initcontainer intel-fpga-admissionwebhook opae-nlb-demo
-          - name: e2e-gpu
-            runner: gpu
-            images: intel-gpu-plugin intel-gpu-initcontainer
-            targetJob: e2e-gpu SKIP=Resource:xe
-          - name: e2e-iaa-spr
-            targetjob: e2e-iaa
-            runner: simics-spr
-            images: intel-iaa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator
+            images:
+              - intel-dsa-plugin
+              - intel-idxd-config-initcontainer
+              - accel-config-demo
+              - intel-deviceplugin-operator
           - name: e2e-iaa-gnr
             targetjob: e2e-iaa
             runner: simics-gnr
-            images: intel-iaa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator
+            images:
+              - intel-iaa-plugin
+              - intel-idxd-config-initcontainer
+              - accel-config-demo
+              - intel-deviceplugin-operator
           - name: e2e-qat
             targetjob: e2e-qat FOCUS=Resource:generic
             runner: qat
-            images: intel-qat-plugin intel-qat-initcontainer crypto-perf
-          - name: e2e-qat4
-            targetjob: e2e-qat FOCUS="Mode:dpdk.*Resource:(cy|dc)" SKIP=App:crypto-perf
-            runner: simics-spr
-            images: intel-qat-plugin intel-qat-initcontainer openssl-qat-engine
-          - name: e2e-sgx
-            targetjob: e2e-sgx FOCUS="|(SGX Admission)"
-            runner: sgx
-            images: intel-sgx-plugin intel-sgx-initcontainer intel-sgx-admissionwebhook sgx-sdk-demo intel-deviceplugin-operator
+            images:
+              - intel-qat-plugin
+              - intel-qat-initcontainer
+              - crypto-perf
+          - name: e2e-fpga
+            runner: fpga
+            images:
+              - intel-fpga-plugin
+              - intel-fpga-initcontainer
+              - intel-fpga-admissionwebhook
+              - opae-nlb-demo
+          - name: e2e-spr
+            runner: spr
+            images:
+              - intel-qat-plugin
+              - intel-qat-initcontainer
+              - openssl-qat-engine
+              - intel-dsa-plugin
+              - intel-idxd-config-initcontainer
+              - accel-config-demo
+              - intel-deviceplugin-operator
+              - intel-iaa-plugin
+              - crypto-perf
+              - intel-gpu-plugin
+              - intel-sgx-plugin
+              - intel-sgx-initcontainer
+              - intel-sgx-admissionwebhook
+              - sgx-sdk-demo
 
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
     env:
       TARGET_JOB: ${{ matrix.targetjob || matrix.name }}
-      IMAGES: ${{ matrix.images }}
+      IMAGES: ${{ join(matrix.images, ' ') }}
 
     steps:
       - uses: actions/checkout@v4
diff --git a/Makefile b/Makefile
index b0726a49..69686f52 100644
--- a/Makefile
+++ b/Makefile
@@ -171,6 +171,9 @@ e2e-iaa:
 e2e-dlb:
 	@$(GO) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus "Device:dlb.*$(ADDITIONAL_FOCUS_REGEX)" $(GENERATED_SKIP_OPT) -delete-namespace-on-failure=false
 
+e2e-spr:
+	@$(GO) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus "Device:(iaa|dsa)|Device:qat.*Mode:dpdk.*Resource:(cy|dc).*" -ginkgo.focus "Device:sgx.*|(SGX Admission)" -ginkgo.focus "Device:gpu.*Resource:i915" $(GENERATED_SKIP_OPT) -delete-namespace-on-failure=false
+
 pre-pull:
 ifeq ($(TAG),devel)
 	@$(BUILDER) pull golang:1.22-bookworm