From 11ab4bd1961977a48effb644a223a3dc6bf6e111 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 2 May 2019 08:44:51 -0700
Subject: [PATCH] Fix aspnet e2e tests - add `-CliManifestName` option to
 run-tests.ps1 command - pass `-CliManifestName` and more from YAML to
 run-tests.ps1   - pass access token suffix

---
 .azure/pipelines/e2e-tests.yml         | 6 +++---
 test/Cli.FunctionalTests/run-tests.ps1 | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml
index 06e544cb49..89872313dc 100644
--- a/.azure/pipelines/e2e-tests.yml
+++ b/.azure/pipelines/e2e-tests.yml
@@ -37,7 +37,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
@@ -73,7 +73,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
@@ -119,7 +119,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1
index fe7e21eac5..d59a4feb33 100644
--- a/test/Cli.FunctionalTests/run-tests.ps1
+++ b/test/Cli.FunctionalTests/run-tests.ps1
@@ -44,6 +44,7 @@ param(
     $HostRid,
     $ProdConManifestUrl,
     $ProdConChannel = 'release/2.1',
+    $CliManifestName = "cli.xml",
     $AdditionalRestoreSources
 )
 
@@ -115,7 +116,7 @@ try {
             Write-Error "Missing required parameter: AssetRootUrl"
         }
         $AssetRootUrl = $AssetRootUrl.TrimEnd('/')
-        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/${CliManifestName}${AccessTokenSuffix}"
         Write-Host "CliMetadataUrl:  $cliMetadataUrl"
         [xml] $cli = Invoke-RestMethod $cliMetadataUrl
         $sdkVersion = $cli.Build.ProductVersion