Skip to content

Commit 39622e9

Browse files
committed
Merge branch 'master' into bez/dailybuildPipeline
2 parents 33cf898 + bd74f60 commit 39622e9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.azure-pipelines/release-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ jobs:
104104
displayName: Run Smoke Test
105105
inputs:
106106
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
107-
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 $(SubscriptionId)"'
107+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 "'
108108

109109
- task: PowerShell@2
110110
displayName: 'Run Smoke Test Reversely'
111111
inputs:
112112
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
113-
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 $(SubscriptionId) -Reverse"'
113+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
114114

115115
- task: PowerShell@2
116116
displayName: Clean Az Modules
@@ -128,13 +128,13 @@ jobs:
128128
displayName: Run Smoke Test
129129
inputs:
130130
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
131-
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 $(SubscriptionId) "'
131+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 "'
132132

133133
- task: PowerShell@2
134134
displayName: 'Run Smoke Test Reversely'
135135
inputs:
136136
filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
137-
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 $(SubscriptionId) -Reverse "'
137+
arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse "'
138138

139139
- task: PowerShell@2
140140
displayName: Clean Az Modules

src/Databricks/help/New-AzDatabricksWorkspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ PS C:\> $networkSecurityGroup = New-AzNetworkSecurityGroup -ResourceGroupName te
4444
PS C:\> $privSubnet = New-AzVirtualNetworkSubnetConfig -Name priv-sub -AddressPrefix "10.0.1.0/24" -NetworkSecurityGroup $networkSecurityGroup -Delegation $dlg
4545
PS C:\> $pubSubnet = New-AzVirtualNetworkSubnetConfig -Name pub-sub -AddressPrefix "10.0.2.0/24" -NetworkSecurityGroup $networkSecurityGroup -Delegation $dlg
4646
PS C:\> $testVN = New-AzVirtualNetwork -Name testvn -ResourceGroupName testgroup -Location eastus -AddressPrefix "10.0.0.0/16" -Subnet $privSubnet,$pubSubnet
47-
PS C:\> New-AzDatabricksWorkspace -Name databricks-test-with-custom-vn -ResourceGroupName testgroup -Location eastus -VirtualNetworkId $testVN.Id -PrivateSubnetName $privSubnet.Name -PublicSubnetName $privSubnet.Name -Sku standard
47+
PS C:\> New-AzDatabricksWorkspace -Name databricks-test-with-custom-vn -ResourceGroupName testgroup -Location eastus -VirtualNetworkId $testVN.Id -PrivateSubnetName $privSubnet.Name -PublicSubnetName $pubSubnet.Name -Sku standard
4848
4949
Location Name Type
5050
-------- ---- ----

0 commit comments

Comments
 (0)