Updated

Azure · Jun 27, 2024 · eb76cd1 · eb76cd1
1 parent 1686b77
commit eb76cd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/.github/template/generate_page/action.yml b/.github/template/generate_page/action.yml
@@ -11,12 +11,6 @@ inputs:
   TOKEN:   
     required: true
     description: "Token for checkin"  
-  ACCOUNT:
-    required: true
-    description: "Storage account name"
-  AUTH_KEY:
-    required: true
-    description: "Storage account key"
 
 runs:
   using: "composite"
@@ -34,9 +28,6 @@ runs:
       shell: bash
       run: |
         ./perf_testing/scripts/fio_bench.sh /mnt/blob_mnt ${{ inputs.TEST }}
-      env:
-        AZURE_STORAGE_ACCOUNT: ${{ inputs.ACCOUNT }}
-        AZURE_STORAGE_ACCESS_KEY: ${{ inputs.AUTH_KEY }}
     
     # Push the bandwidth results and publish the graphs
     - name: "Update Bandwidth Results : ${{ inputs.TEST }}"

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -73,18 +73,18 @@ jobs:
         run: |
           if [ "${{ matrix.TestType }}" == "standard" ]; then
             echo "Create standard accoutn env"
-            echo "STG_ACCOUNT=${{ secrets.STANDARD_ACCOUNT }}" >> $GITHUB_ENV
-            echo "STG_KEY=${{ secrets.STANDARD_KEY }}" >> $GITHUB_ENV
+            echo "AZURE_STORAGE_ACCOUNT=${{ secrets.STANDARD_ACCOUNT }}" >> $GITHUB_ENV
+            echo "AZURE_STORAGE_ACCESS_KEY=${{ secrets.STANDARD_KEY }}" >> $GITHUB_ENV
           else
             echo "Create premium accoutn env"
-            echo "STG_ACCOUNT=${{ secrets.PREMIUM_ACCOUNT }}" >> $GITHUB_ENV
-            echo "STG_KEY=${{ secrets.PREMIUM_KEY }}" >> $GITHUB_ENV
+            echo "AZURE_STORAGE_ACCOUNT=${{ secrets.PREMIUM_ACCOUNT }}" >> $GITHUB_ENV
+            echo "AZURE_STORAGE_ACCESS_KEY=${{ secrets.PREMIUM_KEY }}" >> $GITHUB_ENV
           fi
 
       # Create the config file for testing
       - name: "Create config file for account type: ${{ matrix.TestType }}"
         run: |
-          echo "Storage account is: " $STG_ACCOUNT
+          echo "Storage account is: " $AZURE_STORAGE_ACCOUNT
           blobfuse2 gen-test-config --config-file=azure_block_bench.yaml --container-name=${{ secrets.BENCH_CONTAINER }}  --output-file=./config.yaml
           cat ./config.yaml
 
@@ -106,8 +106,6 @@ jobs:
           TEST: "read"
           TYPE: ${{ matrix.TestType }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ACCOUNT: ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AUTH_KEY: ${{ steps.expose.outputs.STG_KEY }}
 
       # Run the Write tests with high number of threads
       - name: "High threads Test"
@@ -116,8 +114,6 @@ jobs:
           TEST: "highlyparallel"
           TYPE: ${{ matrix.TestType }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ACCOUNT: ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AUTH_KEY: ${{ steps.expose.outputs.STG_KEY }}
 
       # Run the Write tests
       - name: "Write Test"
@@ -126,8 +122,6 @@ jobs:
           TEST: "write"
           TYPE: ${{ matrix.TestType }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ACCOUNT: ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AUTH_KEY: ${{ steps.expose.outputs.STG_KEY }}
 
       # Run the Create tests
       - name: "Create File Test"
@@ -136,8 +130,6 @@ jobs:
           TEST: "create"
           TYPE: ${{ matrix.TestType }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ACCOUNT: ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AUTH_KEY: ${{ steps.expose.outputs.STG_KEY }}
       # ---------------------------------------------------------------------------------------
 
 
@@ -151,9 +143,6 @@ jobs:
           rm -rf /mnt/blob_mnt/*
           rm -rf /mnt/tempcache/*
           ./perf_testing/scripts/fio_bench.sh /mnt/blob_mnt list
-        env:
-          AZURE_STORAGE_ACCOUNT:  ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AZURE_STORAGE_ACCESS_KEY: ${{ steps.expose.outputs.STG_KEY }}
         
       - name: "Update Benchmark Results : List"
         uses: benchmark-action/github-action-benchmark@v1
@@ -178,9 +167,6 @@ jobs:
           rm -rf /mnt/blob_mnt/*
           rm -rf /mnt/tempcache/*
           ./perf_testing/scripts/fio_bench.sh /mnt/blob_mnt app
-        env:
-          AZURE_STORAGE_ACCOUNT:  ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AZURE_STORAGE_ACCESS_KEY: ${{ steps.expose.outputs.STG_KEY }}
 
         
       - name: "Update Bandwidth Results : App"
@@ -248,9 +234,6 @@ jobs:
           rm -rf /mnt/blob_mnt/*
           rm -rf /mnt/tempcache/*
           ./perf_testing/scripts/fio_bench.sh /mnt/blob_mnt rename
-        env:
-          AZURE_STORAGE_ACCOUNT:  ${{ steps.expose.outputs.STG_ACCOUNT }}
-          AZURE_STORAGE_ACCESS_KEY: ${{ steps.expose.outputs.STG_KEY }}
 
       - name: "Update Latency Results : Rename"
         uses: benchmark-action/github-action-benchmark@v1

diff --git a/testdata/config/azure_block_bench.yaml b/testdata/config/azure_block_bench.yaml
@@ -30,4 +30,6 @@ attr_cache:
 azstorage:
   mode: key
   container: { 0 }
+  account-name: { AZURE_STORAGE_ACCOUNT }
+  account-key: { AZURE_STORAGE_ACCESS_KEY }