From 979fa66d3bbbafc0afcbb934bf406623295cd44d Mon Sep 17 00:00:00 2001
From: Trystan Schneider <tschneider@aneo.fr>
Date: Tue, 5 Nov 2024 01:04:55 +0100
Subject: [PATCH] Fix

---
 .github/workflows/bench-aws.yml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bench-aws.yml b/.github/workflows/bench-aws.yml
index 05ebe991a..ae09a3019 100644
--- a/.github/workflows/bench-aws.yml
+++ b/.github/workflows/bench-aws.yml
@@ -11,6 +11,17 @@ jobs:
   benchmark:
     name: Bench ArmoniK on AWS
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type: [localhost, aws]
+        include:
+          - type: localhost
+            ntasks: 100
+            polling-limit: 300
+          - type: aws
+            ntasks: 1000
+            polling-limit: 600
+          
     env:
       prefix: bench
     outputs:
@@ -35,7 +46,8 @@ jobs:
         run: |
           echo "core-version=$(cat versions.tfvars.json | jq -r '.armonik_versions.core')" >> $GITHUB_ENV
 
-      - id: bootstrap-deploy
+      - if: ${{ matrix.type == 'aws' }}
+        id: bootstrap-deploy
         name: Deploy Bootstrap
         uses: aneoconsulting/ArmoniK.Action.Deploy/bootstrap-deploy@main
         with:
@@ -46,25 +58,27 @@ jobs:
         name: "Deploy ArmoniK"
         uses: aneoconsulting/ArmoniK.Action.Deploy/deploy@main
         with:
-          type: aws
+          type: ${{ matrix.type }}
           prefix: ${{ env.prefix }}
-          core-version: ${{ steps.get-armonik-endpoint.outputs.grpc-endpoint }}
+          core-version: ${{ env.core-version }}
 
       - id: get-armonik-endpoint
         name: "Get ArmoniK's control plane endpoint"
+        env:
+          TYPE: ${{ matrix.type }}
         run: |
-          grpc-endpoint=$(cat infrastructure/quick-deploy/aws/generated/armonik-output.json | jq -r '.armonik.control_plane_url' | sed -r 's/(http:\/\/)([^:]*)(:.*)/\2/')
-          echo "grpc-endpoint=$grpc-endpoint" >> "$GITHUB_OUTPUT"
+          grpc_endpoint=$(cat infrastructure/quick-deploy/$TYPE/generated/armonik-output.json | jq -r '.armonik.control_plane_url' | sed -r 's/(http:\/\/)([^:]*)(:.*)/\2/')
+          echo "grpc-endpoint=$grpc_endpoint" >> "$GITHUB_OUTPUT"
 
       - id: bench
         name: Run Bench
         uses: aneoconsulting/ArmoniK.Action.Deploy/bench@ts/add-bench-action
         with:
           armonik-core-version: ${{ env.core-version }}
-          ntasks: 1000
+          ntasks: ${{ matrix.ntasks }}
           session-name: bench
           grpc-client-endpoint: ${{ steps.get-armonik-endpoint.outputs.grpc-endpoint }}
-          generated-folder-path: ${{ steps.deploy.outputs.generated-folder }}/kubeconfig
+          kubeconfig-path: ${{ steps.deploy.outputs.generated-folder }}/kubeconfig
 
       - id: get-bench-stats
         name: Get Bench Stats
@@ -77,17 +91,18 @@ jobs:
       - name: Upload Bench results to artifact registry
         uses: actions/upload-artifact@v4
         with:
-          name: main_benchmark_bench_${{ github.run_id }}
+          name: main_benchmark_with_bench_on_${{ matrix.type }}_${{ github.run_id }}
           path: ${{ steps.get-bench-stats.outputs.bench-file-path }}
     
       - name: Upload benchmarks results to s3
         env:
           BENCH_RESULTS_PATH: ${{ steps.get-bench-stats.outputs.bench-file-path }}
+          TYPE: ${{ matrix.type }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_EC2_METADATA_DISABLED: true
         run: |
-          aws s3 cp "$BENCH_RESULTS_PATH" "s3://test-armonik-bench-storage/main_benchmark_bench_$GITHUB_RUN_ID.json"
+          aws s3 cp "$BENCH_RESULTS_PATH" "s3://test-armonik-bench-storage/main_benchmark_with_bench_on_$TYPE_$GITHUB_RUN_ID.json"
 
       - if: "always()"
         id: destroy