CI fixes

Correct definition of matrix job with override values

.github/workflows/ci.yaml

@@ -8,9 +8,6 @@ on:
 jobs:
   package-lint:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        variant-values: ['ci-multitenant-values.yaml', 'ci-edge-values.yaml']
     steps:
       - uses: actions/checkout@v3
       - name: Setup helm CLI
@@ -36,6 +33,9 @@ jobs:
       - uses: pre-commit/[email protected]
   test-cluster:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        variant-values: ['ci/multitenant-values.yaml', 'ci/edge-values.yaml']
     steps:
       - uses: actions/checkout@v3
       - name: Setup helm CLI
@@ -70,7 +70,7 @@ jobs:
           TENANT_1_SECRET: ${{ secrets.TENANT_1_SECRET }}
           TENANT_2_SECRET: ${{ secrets.TENANT_2_SECRET }}
         run: |
-          helm install smartface . -f ci-values.yaml --set tests.authentication.tenant1.clientSecret="$TENANT_1_SECRET" --set tests.authentication.tenant2.clientSecret="$TENANT_2_SECRET" -f ${{ matrix.variant-values }}
+          helm install smartface . -f ci/test-values.yaml --set tests.authentication.tenant1.clientSecret="$TENANT_1_SECRET" --set tests.authentication.tenant2.clientSecret="$TENANT_2_SECRET" -f ${{ matrix.variant-values }}
           kubectl rollout status deployment sf-api --timeout=300s
           kubectl wait --for=condition=complete job/sf-wl-update-log-population --timeout=300s
       - name: Test helm chart

ci/edge-values.yaml

@@ -0,0 +1,3 @@
+features:
+  edgeStreams:
+    enabled: true

ci/multitenant-values.yaml

@@ -0,0 +1,3 @@
+features:
+  multitenancy:
+    enabled: true

ci-values.yaml → ci/test-values.yaml

@@ -10,11 +10,6 @@ minio:
   persistence:
     enabled: false
 
-# We enabled edge streams so we can run all of the tests in one go with all features enabled
-features:
-  edgeStreams:
-    enabled: true
-
 configurations:
   apiAuth:
     authority: "https://smartface-test.eu.auth0.com"