Resolving merge conflict-1

knithinc · knithinc · commit e89fca886649 · 2017-06-28T10:28:09.000-07:00
diff --git a/CanaryValidator/Canary.Tests.ps1 b/CanaryValidator/Canary.Tests.ps1
@@ -315,7 +315,7 @@ while ($runCount -le $NumberOfIterations)
                         }
                         New-Item -Path $CanaryCustomImageFolder -ItemType Directory
                         $CustomVHDPath = CopyImage -ImagePath $LinuxImagePath -OutputFolder $CanaryCustomImageFolder
-                        Add-VMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -osDiskLocalPath $CustomVHDPath -osType Linux -tenantID $TenantID -azureStackCredentials $ServiceAdminCredentials -Location $ResourceLocation -CreateGalleryItem $false -EnvironmentName $SvcAdminEnvironmentName
+                        Add-AzsVMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -osDiskLocalPath $CustomVHDPath -osType Linux -Location $ResourceLocation -CreateGalleryItem $false
                         Remove-Item $CanaryCustomImageFolder -Force -Recurse
                         $linuxUpload = $true
                     }    

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ while ($runCount -le $NumberOfIterations)`
`315`	`315`	`}`
`316`	`316`	`New-Item -Path $CanaryCustomImageFolder -ItemType Directory`
`317`	`317`	`$CustomVHDPath = CopyImage -ImagePath $LinuxImagePath -OutputFolder $CanaryCustomImageFolder`
`318`		`- Add-VMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -osDiskLocalPath $CustomVHDPath -osType Linux -tenantID $TenantID -azureStackCredentials $ServiceAdminCredentials -Location $ResourceLocation -CreateGalleryItem $false -EnvironmentName $SvcAdminEnvironmentName`
	`318`	`+ Add-AzsVMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -osDiskLocalPath $CustomVHDPath -osType Linux -Location $ResourceLocation -CreateGalleryItem $false`
`319`	`319`	`Remove-Item $CanaryCustomImageFolder -Force -Recurse`
`320`	`320`	`$linuxUpload = $true`
`321`	`321`	`}`