workflows: use a single image for core and non-core

- add amzn2 kernel images to test - minor job name fix (non CO-RE)
r21gh · Apr 28, 2022 · c27a040 · c27a040
1 parent 7595d30
commit c27a040
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -176,7 +176,7 @@ jobs:
           - "TRC-2"
         kernel:
           - "4.19.238-stable"
-          - "5.4.189-stable"
+          - "5.4.188-amzn2"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
           - "5.13.19-ubuntu"
@@ -194,6 +194,7 @@ jobs:
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
+            -e is_noncore=0 \
             -t rafaeldtinoco/tracee-test-kernels:latest
   NON-CO-RE:
     runs-on: ubuntu-20.04
@@ -206,7 +207,7 @@ jobs:
           - "TRC-2"
         kernel:
           - "4.19.238-stable"
-          - "5.4.189-stable"
+          - "5.4.188-amzn2"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
           - "5.13.19-ubuntu"
@@ -217,11 +218,12 @@ jobs:
           submodules: true
       - name: "Pull test container image"
         run: |
-          docker image pull rafaeldtinoco/tracee-test-noncore:latest
+          docker image pull rafaeldtinoco/tracee-test-kernels:latest
       - name: "Run tests"
         run: |
           docker run --rm --privileged -v $(pwd):/tracee:rw \
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
-            -t rafaeldtinoco/tracee-test-noncore:latest
+            -e is_noncore=1 \
+            -t rafaeldtinoco/tracee-test-kernels:latest
diff --git a/.github/workflows/test-core-daily.yaml b/.github/workflows/test-core-daily.yaml
@@ -18,6 +18,7 @@ jobs:
         kernel:
           - "4.19.238-stable"
           - "5.4.166-ubuntu+"
+          - "5.4.188-amzn2"
           - "5.4.189-stable"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
@@ -43,4 +44,5 @@ jobs:
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
+            -e is_noncore=0 \
             -t rafaeldtinoco/tracee-test-kernels:latest
diff --git a/.github/workflows/test-core-weekly.yaml b/.github/workflows/test-core-weekly.yaml
@@ -28,6 +28,7 @@ jobs:
         kernel:
           - "4.19.238-stable"
           - "5.4.166-ubuntu+"
+          - "5.4.188-amzn2"
           - "5.4.189-stable"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
@@ -53,4 +54,5 @@ jobs:
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
+            -e is_noncore=0 \
             -t rafaeldtinoco/tracee-test-kernels:latest
diff --git a/.github/workflows/test-noncore-daily.yaml b/.github/workflows/test-noncore-daily.yaml
@@ -1,7 +1,7 @@
 #
 # Daily Test: TRC-2 with selected kernels.
 #
-name: CO-RE (DAILY)
+name: NON CO-RE (DAILY)
 on:
   workflow_dispatch: {}
   schedule:
@@ -18,6 +18,7 @@ jobs:
         kernel:
           - "4.19.238-stable"
           - "5.4.166-ubuntu+"
+          - "5.4.188-amzn2"
           - "5.4.189-stable"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
@@ -36,11 +37,12 @@ jobs:
           submodules: true
       - name: "Pull test container image"
         run: |
-          docker image pull rafaeldtinoco/tracee-test-noncore:latest
+          docker image pull rafaeldtinoco/tracee-test-kernels:latest
       - name: "Run tests"
         run: |
           docker run --rm --privileged -v $(pwd):/tracee:rw \
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
-            -t rafaeldtinoco/tracee-test-noncore:latest
+            -e is_noncore=1 \
+            -t rafaeldtinoco/tracee-test-kernels:latest
diff --git a/.github/workflows/test-noncore-weekly.yaml b/.github/workflows/test-noncore-weekly.yaml
@@ -1,7 +1,7 @@
 #
 # Weekly Test: TRC-2 with selected kernels.
 #
-name: CO-RE (WEEKLY)
+name: NON CO-RE (WEEKLY)
 on:
   workflow_dispatch: {}
   schedule:
@@ -28,6 +28,7 @@ jobs:
         kernel:
           - "4.19.238-stable"
           - "5.4.166-ubuntu+"
+          - "5.4.188-amzn2"
           - "5.4.189-stable"
           - "5.8.18-ubuntu"
           - "5.10.111-stable"
@@ -46,11 +47,12 @@ jobs:
           submodules: true
       - name: "Pull test container image"
         run: |
-          docker image pull rafaeldtinoco/tracee-test-noncore:latest
+          docker image pull rafaeldtinoco/tracee-test-kernels:latest
       - name: "Run tests"
         run: |
           docker run --rm --privileged -v $(pwd):/tracee:rw \
             -e kvm_accel="tcg" \
             -e kern_version=${{ matrix.kernel }} \
             -e test_name=${{ matrix.signature }} \
-            -t rafaeldtinoco/tracee-test-noncore:latest
+            -e is_noncore=1 \
+            -t rafaeldtinoco/tracee-test-kernels:latest