Fix AzureRT test in dogfood

Author: hyonholee

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

@@ -1596,18 +1596,11 @@ public string GetAzureVMImageName(string[] keywords, bool exactMatch = true, int
             Collection<SM.OSImageContext> vmImages = GetAzureVMImage();
             foreach (SM.OSImageContext image in vmImages)
             {
-                if (Utilities.MatchKeywords(image.ImageName, keywords, exactMatch) >= 0
+                if ((Utilities.MatchKeywords(image.ImageName, keywords, exactMatch) >= 0
+                    || Utilities.MatchKeywords(image.OS, keywords, exactMatch) >= 0)
                     && ((diskSize == null) || (image.LogicalSizeInGB <= diskSize))
-                    && image.Location.Contains(CredentialHelper.Location)
-                    && image.ImageFamily.Contains("Server"))
-                    return image.ImageName;
-            }
-            foreach (SM.OSImageContext image in vmImages)
-            {
-                if (Utilities.MatchKeywords(image.OS, keywords, exactMatch) >= 0
-                    && ((diskSize == null) || (image.LogicalSizeInGB <= diskSize))
-                    && image.Location.Contains(CredentialHelper.Location)
-                    && image.ImageFamily.Contains("Server"))
+                    && Utilities.MatchKeywords(image.Location, new [] {CredentialHelper.Location}, exactMatch) >= 0
+                    && Utilities.MatchKeywords(image.ImageFamily, new [] {"Server"}, exactMatch) >= 0)
                     return image.ImageName;
             }
             return null;