From 688909410ec9746dd8549a2f7c3155ca11abbaf3 Mon Sep 17 00:00:00 2001 From: wyunchi-ms Date: Thu, 16 Feb 2023 10:28:57 +0800 Subject: [PATCH 1/2] Fix the live test of developement --- .../LiveTests/TestLiveScenarios.ps1 | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 b/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 index 825c8eb024b0..c610e79cad7c 100644 --- a/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 +++ b/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 @@ -1,30 +1,30 @@ -Invoke-LiveTestScenario -Name "Create Spring Cloud Instance" -Description "Test the process of create a new spring cloud instance." -ScenarioScript ` -{ - param ($rg) +# Invoke-LiveTestScenario -Name "Create Spring Cloud Instance" -Description "Test the process of create a new spring cloud instance." -ScenarioScript ` +# { +# param ($rg) - $rgName = $rg.ResourceGroupName - $location = "eastus" - $springCloudServiceName = New-LiveTestResourceName +# $rgName = $rg.ResourceGroupName +# $location = "eastus" +# $springCloudServiceName = New-LiveTestResourceName - $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" +# $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" - Assert-AreEqual $springCloudServiceName $springCloudInstance.Name -} +# Assert-AreEqual $springCloudServiceName $springCloudInstance.Name +# } -Invoke-LiveTestScenario -Name "Create Spring Cloud App Instance" -Description "Test the process of create a new spring cloud app instance." -ScenarioScript ` -{ - param ($rg) +# Invoke-LiveTestScenario -Name "Create Spring Cloud App Instance" -Description "Test the process of create a new spring cloud app instance." -ScenarioScript ` +# { +# param ($rg) - $rgName = $rg.ResourceGroupName - $location = "eastus" - $springCloudServiceName = New-LiveTestResourceName - $appName = New-LiveTestResourceName +# $rgName = $rg.ResourceGroupName +# $location = "eastus" +# $springCloudServiceName = New-LiveTestResourceName +# $appName = New-LiveTestResourceName - $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" - $appInstance = New-AzSpringCloudApp -ResourceGroupName $rgName -ServiceName $springCloudServiceName -Name $appName +# $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" +# $appInstance = New-AzSpringCloudApp -ResourceGroupName $rgName -ServiceName $springCloudServiceName -Name $appName - Assert-AreEqual $appName $appInstance.Name -} +# Assert-AreEqual $appName $appInstance.Name +# } Invoke-LiveTestScenario -Name "Create Spring Cloud App Deployment Instance" -Description "Test the process of create a new spring cloud app deployment instance." -ScenarioScript ` { @@ -38,7 +38,8 @@ Invoke-LiveTestScenario -Name "Create Spring Cloud App Deployment Instance" -Des $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" $appInstance = New-AzSpringCloudApp -ResourceGroupName $rgName -ServiceName $springCloudServiceName -Name $appName - $deployment = New-AzSpringCloudAppDeployment -ResourceGroupName $rgName -Name $springCloudServiceName -AppName $appName -DeploymentName $deploymentName + $jarSource = New-AzSpringCloudAppDeploymentJarUploadedObject -RuntimeVersion "Java_8" + $deployment = New-AzSpringCloudAppDeployment -ResourceGroupName $rgName -ServiceName $springCloudServiceName -AppName $appName -DeploymentName $deploymentName -Source $jarSource -EnvironmentVariable @{"env" = "prod"} Assert-AreEqual $appName $appInstance.Name } From c87ee3fb4ba6c1c0ee713306040b2492ae7cfc78 Mon Sep 17 00:00:00 2001 From: wyunchi-ms Date: Thu, 16 Feb 2023 10:30:08 +0800 Subject: [PATCH 2/2] Fix the live test of developement --- .../LiveTests/TestLiveScenarios.ps1 | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 b/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 index c610e79cad7c..b9de4db64339 100644 --- a/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 +++ b/src/SpringCloud/LiveTests/TestLiveScenarios.ps1 @@ -1,30 +1,30 @@ -# Invoke-LiveTestScenario -Name "Create Spring Cloud Instance" -Description "Test the process of create a new spring cloud instance." -ScenarioScript ` -# { -# param ($rg) +Invoke-LiveTestScenario -Name "Create Spring Cloud Instance" -Description "Test the process of create a new spring cloud instance." -ScenarioScript ` +{ + param ($rg) -# $rgName = $rg.ResourceGroupName -# $location = "eastus" -# $springCloudServiceName = New-LiveTestResourceName + $rgName = $rg.ResourceGroupName + $location = "eastus" + $springCloudServiceName = New-LiveTestResourceName -# $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" + $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" -# Assert-AreEqual $springCloudServiceName $springCloudInstance.Name -# } + Assert-AreEqual $springCloudServiceName $springCloudInstance.Name +} -# Invoke-LiveTestScenario -Name "Create Spring Cloud App Instance" -Description "Test the process of create a new spring cloud app instance." -ScenarioScript ` -# { -# param ($rg) +Invoke-LiveTestScenario -Name "Create Spring Cloud App Instance" -Description "Test the process of create a new spring cloud app instance." -ScenarioScript ` +{ + param ($rg) -# $rgName = $rg.ResourceGroupName -# $location = "eastus" -# $springCloudServiceName = New-LiveTestResourceName -# $appName = New-LiveTestResourceName + $rgName = $rg.ResourceGroupName + $location = "eastus" + $springCloudServiceName = New-LiveTestResourceName + $appName = New-LiveTestResourceName -# $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" -# $appInstance = New-AzSpringCloudApp -ResourceGroupName $rgName -ServiceName $springCloudServiceName -Name $appName + $springCloudInstance = New-AzSpringCloud -ResourceGroupName $rgName -Name $springCloudServiceName -Location $location -SkuTier "Basic" -SkuName "B0" + $appInstance = New-AzSpringCloudApp -ResourceGroupName $rgName -ServiceName $springCloudServiceName -Name $appName -# Assert-AreEqual $appName $appInstance.Name -# } + Assert-AreEqual $appName $appInstance.Name +} Invoke-LiveTestScenario -Name "Create Spring Cloud App Deployment Instance" -Description "Test the process of create a new spring cloud app deployment instance." -ScenarioScript ` {