Skip to content

Commit ee89699

Browse files
authored
Fixing Crank test app paths (#6655)
1 parent 95ac217 commit ee89699

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

tools/Crank/benchmarks.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ scenarios:
3131
application:
3232
job: functionsServer
3333
environmentVariables:
34-
HOME: "{{ TempPath }}"
34+
HOME: "{{ HomePath }}"
3535
WEBSITE_SITE_NAME: "Test"
3636
WEBSITE_INSTANCE_ID: "8399B720-AB73-46D6-94DE-5A27871B3155"
3737
WEBSITE_OWNER_NAME: "A5F47496-A284-4788-A127-E79454330567+westuswebspace"
38-
AzureWebJobsScriptRoot: "{{ FunctionAppPath }}"
3938
ASPNETCORE_URLS: "{{ AspNetUrls }}"
4039
load:
4140
job: bombardier
@@ -46,12 +45,11 @@ scenarios:
4645
application:
4746
job: functionsServer
4847
environmentVariables:
49-
HOME: "{{ TempPath }}"
48+
HOME: "{{ HomePath }}"
5049
WEBSITE_SITE_NAME: "Test"
5150
WEBSITE_INSTANCE_ID: "8399B720-AB73-46D6-94DE-5A27871B3155"
5251
WEBSITE_OWNER_NAME: "A5F47496-A284-4788-A127-E79454330567+westuswebspace"
5352
FUNCTIONS_LOGS_MOUNT_PATH: "{{ TempLogPath }}"
54-
AzureWebJobsScriptRoot: "{{ FunctionAppPath }}"
5553
ASPNETCORE_URLS: "{{ AspNetUrls }}"
5654
load:
5755
job: bombardier

tools/Crank/run-benchmarks.ps1

+3-8
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,8 @@ $crankConfigPath = Join-Path `
6464

6565
$isLinuxApp = $CrankAgentVm -match '\blinux\b'
6666

67-
$functionAppPath = if ($isLinuxApp) {
68-
"/home/$UserName/FunctionApps/$FunctionApp"
69-
} else {
70-
"C:\FunctionApps\$FunctionApp"
71-
}
72-
73-
$tmpPath = if ($isLinuxApp) { "/tmp" } else { 'C:\Temp' }
67+
$homePath = if ($isLinuxApp) { "/home/$UserName/FunctionApps/$FunctionApp" } else { "C:\FunctionApps\$FunctionApp" }
68+
$functionAppPath = if ($isLinuxApp) { "/home/$UserName/FunctionApps/$FunctionApp/site/wwwroot" } else { "C:\FunctionApps\$FunctionApp\site\wwwroot" }
7469
$tmpLogPath = if ($isLinuxApp) { "/tmp/functions/log" } else { 'C:\Temp\Functions\Log' }
7570

7671
if ($UseHttps) {
@@ -88,7 +83,7 @@ $crankArgs =
8883
'--profile', $profileName,
8984
'--variable', "CrankAgentVm=$CrankAgentVm",
9085
'--variable', "FunctionAppPath=`"$functionAppPath`"",
91-
'--variable', "TempPath=`"$tmpPath`"",
86+
'--variable', "HomePath=`"$homePath`"",
9287
'--variable', "TempLogPath=`"$tmpLogPath`"",
9388
'--variable', "BranchOrCommit=$BranchOrCommit",
9489
'--variable', "AspNetUrls=$aspNetUrls"

0 commit comments

Comments
 (0)