From 99594a33a12ab7491f7461a960ac75166527d150 Mon Sep 17 00:00:00 2001
From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Wed, 16 Nov 2022 17:35:52 +0200
Subject: [PATCH] CI: get rid of duplicates in e2e jobs

Fixes: #1136
---
 .github/workflows/e2e-dlb.yml  | 45 ------------------
 .github/workflows/e2e-dsa.yml  | 45 ------------------
 .github/workflows/e2e-fpga.yml | 41 ----------------
 .github/workflows/e2e-gpu.yml  | 41 ----------------
 .github/workflows/e2e-iaa.yml  | 45 ------------------
 .github/workflows/e2e-qat.yml  | 42 ----------------
 .github/workflows/e2e-qat4.yml | 41 ----------------
 .github/workflows/e2e-sgx.yml  | 41 ----------------
 .github/workflows/e2e.yml      | 87 ++++++++++++++++++++++++++++++++++
 9 files changed, 87 insertions(+), 341 deletions(-)
 delete mode 100644 .github/workflows/e2e-dlb.yml
 delete mode 100644 .github/workflows/e2e-dsa.yml
 delete mode 100644 .github/workflows/e2e-fpga.yml
 delete mode 100644 .github/workflows/e2e-gpu.yml
 delete mode 100644 .github/workflows/e2e-iaa.yml
 delete mode 100644 .github/workflows/e2e-qat.yml
 delete mode 100644 .github/workflows/e2e-qat4.yml
 delete mode 100644 .github/workflows/e2e-sgx.yml
 create mode 100644 .github/workflows/e2e.yml

diff --git a/.github/workflows/e2e-dlb.yml b/.github/workflows/e2e-dlb.yml
deleted file mode 100644
index 67e619f61..000000000
--- a/.github/workflows/e2e-dlb.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: e2e-dlb
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-dlb-plugin intel-dlb-initcontainer dlb-libdlb-demo'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-dlb:
-    name: e2e-dlb
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [simics-spr, simics-gnr]
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-dsa.yml b/.github/workflows/e2e-dsa.yml
deleted file mode 100644
index efdf3c4b2..000000000
--- a/.github/workflows/e2e-dsa.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: e2e-dsa
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-dsa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-dsa:
-    name: e2e-dsa
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [simics-spr, simics-gnr]
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-fpga.yml b/.github/workflows/e2e-fpga.yml
deleted file mode 100644
index cd4f28bee..000000000
--- a/.github/workflows/e2e-fpga.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: e2e-fpga
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-fpga-plugin intel-fpga-initcontainer intel-fpga-admissionwebhook opae-nlb-demo'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-fpga:
-    name: e2e-fpga
-    runs-on: [self-hosted, linux, x64, fpga]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-gpu.yml b/.github/workflows/e2e-gpu.yml
deleted file mode 100644
index 03feacb26..000000000
--- a/.github/workflows/e2e-gpu.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: e2e-gpu
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-gpu-plugin intel-gpu-initcontainer'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-gpu:
-    name: e2e-gpu
-    runs-on: [self-hosted, linux, x64, gpu]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-iaa.yml b/.github/workflows/e2e-iaa.yml
deleted file mode 100644
index 7c3f0ab76..000000000
--- a/.github/workflows/e2e-iaa.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: e2e-iaa
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-iaa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-iaa:
-    name: e2e-iaa
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [simics-spr, simics-gnr]
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-qat.yml b/.github/workflows/e2e-qat.yml
deleted file mode 100644
index 993eed5cf..000000000
--- a/.github/workflows/e2e-qat.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: e2e-qat
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-qat-plugin intel-qat-initcontainer crypto-perf'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-qat:
-    name: e2e-qat
-    #if: contains('["bart0sh"]', github.actor)
-    runs-on: [self-hosted, linux, x64, qat]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-qat4.yml b/.github/workflows/e2e-qat4.yml
deleted file mode 100644
index db2c59512..000000000
--- a/.github/workflows/e2e-qat4.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: e2e-qat4
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-qat-plugin intel-qat-initcontainer openssl-qat-engine'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-qat4:
-    name: e2e-qat4
-    runs-on: [simics-spr]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e-sgx.yml b/.github/workflows/e2e-sgx.yml
deleted file mode 100644
index b0e2c2d25..000000000
--- a/.github/workflows/e2e-sgx.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: e2e-sgx
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 4 * * *'
-  pull_request:
-    branches:
-      - main
-      - 'release-*'
-  push:
-    branches:
-      - main
-      - 'release-*'
-
-env:
-  IMAGES: 'intel-sgx-plugin intel-sgx-initcontainer intel-sgx-admissionwebhook'
-
-permissions:
-  contents: read
-
-jobs:
-  e2e-sgx:
-    name: e2e-sgx
-    runs-on: [self-hosted, linux, x64, sgx]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Describe test environment
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Actor: ${{ github.actor }}"
-          echo "Ref: ${{ github.ref }}"
-          echo "SHA: ${{ github.sha }}"
-          echo "Images: $IMAGES"
-      - name: Wait for ready state
-        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
-      - name: Prepare test environment
-        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
-      - name: Run tests
-        run: ../../../../bmetal/actions-bmetal-runstage.sh test
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
new file mode 100644
index 000000000..56383c94d
--- /dev/null
+++ b/.github/workflows/e2e.yml
@@ -0,0 +1,87 @@
+name: e2e
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 4 * * *'
+  pull_request:
+    branches:
+      - main
+      - 'release-*'
+  push:
+    branches:
+      - main
+      - 'release-*'
+
+permissions:
+  contents: read
+
+jobs:
+  e2e:
+    strategy:
+      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-dlb-spr
+            targetjob: e2e-dlb
+            runner: simics-spr
+            images: intel-dlb-plugin intel-dlb-initcontainer dlb-libdlb-demo
+          - name: e2e-dlb-gnr
+            targetjob: e2e-dlb
+            runner: simics-gnr
+            images: intel-dlb-plugin intel-dlb-initcontainer dlb-libdlb-demo
+          - 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
+          - name: e2e-iaa-spr
+            targetjob: e2e-iaa
+            runner: simics-spr
+            images: intel-iaa-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
+          - name: e2e-qat
+            runner: qat
+            images: intel-qat-plugin intel-qat-initcontainer crypto-perf
+          - name: e2e-qat4
+            runner: simics-spr
+            images: intel-qat-plugin intel-qat-initcontainer openssl-qat-engine
+          - name: e2e-sgx
+            runner: sgx
+            images: intel-sgx-plugin intel-sgx-initcontainer intel-sgx-admissionwebhook
+
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.runner }}
+    env:
+      TARGET_JOB: ${{ matrix.targetjob || matrix.name }}
+      IMAGES: ${{ matrix.images }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Describe test environment
+        run: |
+          echo "Event name: ${{ github.event_name }}"
+          echo "Actor: ${{ github.actor }}"
+          echo "Ref: ${{ github.ref }}"
+          echo "SHA: ${{ github.sha }}"
+          echo "Images: $IMAGES"
+          echo "Target job: $TARGET_JOB"
+      - name: Wait for ready state
+        run: ../../../../bmetal/actions-bmetal-runstage.sh waitready
+      - name: Prepare test environment
+        run: ../../../../bmetal/actions-bmetal-runstage.sh prepare
+      - name: Run tests
+        run: ../../../../bmetal/actions-bmetal-runstage.sh test