chore: merge e2e tests with cel e2e tests

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
kyverno · Oct 8, 2024 · 8d5ccbb · 8d5ccbb
1 parent 4892527
commit 8d5ccbb
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 45 deletions.
diff --git a/.github/workflows/cel-test.yml b/.github/workflows/cel-test.yml
@@ -27,9 +27,6 @@ jobs:
           - name: v1.31
             version: v1.31.0
         tests:
-          - ^argo-cel$
-          - ^aws-cel$
-          - ^best-practices-cel$
           - ^consul-cel$
           - ^flux-cel$
           - ^istio-cel$

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,6 +34,24 @@ jobs:
       with:
         path: argo
 
+  argo-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: argo-cel
+
   aws:
     strategy:
       fail-fast: false
@@ -52,6 +70,24 @@ jobs:
       with:
         path: aws
 
+  aws-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: aws-cel
+
   best-practices:
     strategy:
       fail-fast: false
@@ -73,6 +109,27 @@ jobs:
         shard-index: ${{ matrix.shard-index }}
         shard-count: 2
 
+  best-practices-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+        shard-index: [0,1]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: best-practices-cel
+        shard-index: ${{ matrix.shard-index }}
+        shard-count: 2
+
   castai:
     strategy:
       fail-fast: false

diff --git a/.hack/restructure.sh b/.hack/restructure.sh