Crank script updates (#6591)

Author: mathewc

tools/Crank/benchmarks.yml

@@ -10,7 +10,7 @@ jobs:
     readyStateText: Application started.
 
 scenarios:
-  functionApp:
+  http:
     application:
       job: server
       environmentVariables:
@@ -21,6 +21,37 @@ scenarios:
       variables:
         path: /api/Hello
         duration: 180
+  http-appsvc:
+    application:
+      job: server
+      environmentVariables:
+        HOME: "{{ TempPath }}"
+        WEBSITE_SITE_NAME: "Test"
+        WEBSITE_INSTANCE_ID: "8399B720-AB73-46D6-94DE-5A27871B3155"
+        WEBSITE_OWNER_NAME: "A5F47496-A284-4788-A127-E79454330567+westuswebspace"
+        AzureWebJobsScriptRoot: "{{ FunctionAppPath }}"
+        ASPNETCORE_URLS: "http://localhost:5000;https://localhost:5001"
+    load:
+      job: bombardier
+      variables:
+        path: /api/Hello
+        duration: 180
+  http-linux-appsvc:
+    application:
+      job: server
+      environmentVariables:
+        HOME: "{{ TempPath }}"
+        WEBSITE_SITE_NAME: "Test"
+        WEBSITE_INSTANCE_ID: "8399B720-AB73-46D6-94DE-5A27871B3155"
+        WEBSITE_OWNER_NAME: "A5F47496-A284-4788-A127-E79454330567+westuswebspace"
+        FUNCTIONS_LOGS_MOUNT_PATH: "{{ TempLogPath }}"
+        AzureWebJobsScriptRoot: "{{ FunctionAppPath }}"
+        ASPNETCORE_URLS: "http://localhost:5000;https://localhost:5001"
+    load:
+      job: bombardier
+      variables:
+        path: /api/Hello
+        duration: 180
 
 profiles:
   local:

tools/Crank/run-benchmarks.ps1

@@ -4,7 +4,10 @@ param(
     $CrankAgentVm,
 
     [string]
-    $FunctionsHostBranchOrCommit = 'dev',
+    $BranchOrCommit = 'dev',
+
+    [string]
+    $Scenario = 'http',
 
     [string]
     $FunctionApp = 'HelloApp',
@@ -59,18 +62,22 @@ $crankConfigPath = Join-Path `
 $isLinuxApp = $CrankAgentVm -match '\blinux\b'
 
 $functionAppRootPath = if ($isLinuxApp) { "/home/$UserName/FunctionApps" } else { 'C:\FunctionApps' }
-                    
 $functionAppPath = Join-Path `
                     -Path $functionAppRootPath `
                     -ChildPath $FunctionApp
 
+$tmpPath = if ($isLinuxApp) { "/tmp" } else { 'C:\Temp' }
+$tmpLogPath = if ($isLinuxApp) { "/tmp/functions/log" } else { 'C:\Temp\Functions\Log' }
+
 $crankArgs =
     '--config', $crankConfigPath,
-    '--scenario', 'functionApp',
+    '--scenario', $Scenario,
     '--profile', 'local',
     '--variable', "CrankAgentVm=$CrankAgentVm",
     '--variable', "FunctionAppPath=`"$functionAppPath`"",
-    '--variable', "FunctionsHostBranchOrCommit=$FunctionsHostBranchOrCommit"
+    '--variable', "TempPath=`"$tmpPath`"",
+    '--variable', "TempLogPath=`"$tmpLogPath`"",
+    '--variable', "BranchOrCommit=$BranchOrCommit"
 
 if ($WriteResultsToDatabase) {
     Set-AzContext -Subscription 'Antares-Demo' > $null