Handle different ProgramData path in long haul and stress test (Azure…

…#1572) Update e2e test script to use ProgramData environment variable to set binds in deployment json for long haul and stress test
Federico-Figalli · Aug 15, 2019 · 0badeb8 · 0badeb8
1 parent fd019af
commit 0badeb8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/e2e_deployment_files/long_haul_deployment.template.windows.json b/e2e_deployment_files/long_haul_deployment.template.windows.json
@@ -183,7 +183,7 @@
                 "value": "snitcher=info"
               },
               "MANAGEMENT_URI": {
-                "value": "unix:///C:/ProgramData/iotedge/mgmt/sock"
+                "value": "<Management.Uri>"
               }
             },
             "settings": {

diff --git a/e2e_deployment_files/stress_deployment.template.windows.json b/e2e_deployment_files/stress_deployment.template.windows.json
@@ -153,12 +153,12 @@
                 "value": "snitcher=info"
               },
               "MANAGEMENT_URI": {
-                "value": "unix:///C:/ProgramData/iotedge/mgmt/sock"
+                "value": "<Management.Uri>"
               }
             },
             "settings": {
               "image": "<Container_Registry>/microsoft/snitcher:<Snitch.BuildNumber>-windows-<Architecture>",
-              "createOptions": "{\"HostConfig\":{\"Binds\":[\"C:\\\\ProgramData\\\\iotedge\\\\mgmt:C:\\\\ProgramData\\\\iotedge\\\\mgmt\"]}}"
+              "createOptions": "{\"HostConfig\":{\"Binds\":[<Snitch.Binds>]}}"
             }
           },
           "analyzer": {

diff --git a/scripts/windows/test/Run-E2ETest.ps1 b/scripts/windows/test/Run-E2ETest.ps1
@@ -442,6 +442,10 @@ Function PrepareTestFromArtifacts
                 (Get-Content $DeploymentWorkingFilePath).replace('<Snitch.StorageAccount>',$SnitchStorageAccount) | Set-Content $DeploymentWorkingFilePath
                 (Get-Content $DeploymentWorkingFilePath).replace('<Snitch.StorageMasterKey>',$SnitchStorageMasterKey) | Set-Content $DeploymentWorkingFilePath
                 (Get-Content $DeploymentWorkingFilePath).replace('<Snitch.TestDurationInSecs>',$SnitchTestDurationInSecs) | Set-Content $DeploymentWorkingFilePath
+                $SnitcherBinds = "\""$($env:ProgramData.Replace("\", "\\\\"))\\\\iotedge\\\\mgmt:$($env:ProgramData.Replace("\", "\\\\"))\\\\iotedge\\\\mgmt\"""
+                (Get-Content $DeploymentWorkingFilePath).replace('<Snitch.Binds>',$SnitcherBinds) | Set-Content $DeploymentWorkingFilePath
+                $ManagementUri = "unix:///$($env:ProgramData.Replace("\", "/"))/iotedge/mgmt/sock"
+                (Get-Content $DeploymentWorkingFilePath).replace('<Management.Uri>',$ManagementUri) | Set-Content $DeploymentWorkingFilePath
             }
             "TempFilter"
             {