Use Dockerfile paths to determine which test data is in scope (#4207)

(cherry picked from commit 6609af4)

Author: mthalman

eng/common/templates/stages/build-test-publish-repo.yml

@@ -60,6 +60,7 @@ stages:
         # values aren't actually used for the pre-build tests.
         - powershell: |
             echo "##vso[task.setvariable variable=productVersion]"
+            echo "##vso[task.setvariable variable=imageBuilderPaths]"
             echo "##vso[task.setvariable variable=osVersions]"
             echo "##vso[task.setvariable variable=architecture]"
           displayName: Initialize Test Variables

eng/common/templates/steps/parse-os-versions.yml renamed to eng/common/templates/steps/parse-test-arg-arrays.yml

@@ -4,8 +4,12 @@ steps:
     $osVersionsDisplayName = '$(osVersions)' -Replace '--os-version ', '' -Replace ' ', '/'
 
     # Defines a PowerShell snippet in string-form that can be used to initialize an array of the OS versions
-    $osVersionsArrayInitStr="@('" + $($osVersionsDisplayName -Replace "/", "', '") + "')"
+    $osVersionsArrayInitStr = "@('" + $($osVersionsDisplayName -Replace "/", "', '") + "')"
     
     echo "##vso[task.setvariable variable=osVersionsDisplayName]$osVersionsDisplayName"
     echo "##vso[task.setvariable variable=osVersionsArrayInitStr]$osVersionsArrayInitStr"
-  displayName: Parse OS Versions
+
+    # Defines a PowerShell snippet in string-form that can be used to initialize an array of the image builder paths
+    $pathInitStr = "@('" + $('$(imageBuilderPaths)' -Replace '--path', '' -Replace " ", "', '") + "')"
+    echo "##vso[task.setvariable variable=imageBuilderPathsArrayInitStr]$pathInitStr"
+  displayName: Parse Test Arg Arrays

eng/common/templates/steps/test-images-linux-client.yml

@@ -50,15 +50,15 @@ steps:
       parameters:
         targetPath: $(Build.ArtifactStagingDirectory)
         condition: ${{ parameters.condition }}
-- template: parse-os-versions.yml
+- template: parse-test-arg-arrays.yml
 - powershell: >
     $(test.init);
     docker exec
     $(testRunner.options)
     $(testRunner.container)
     pwsh
     -Command "$(testScriptPath)
-    -Version '$(productVersion)'
+    -Paths $(imageBuilderPathsArrayInitStr)
     -OSVersions $(osVersionsArrayInitStr)
     -Architecture '$(architecture)'
     $(optionalTestArgs)"

eng/common/templates/steps/test-images-windows-client.yml

@@ -33,11 +33,11 @@ steps:
     parameters:
       targetPath: $(Build.ArtifactStagingDirectory)
       condition: ${{ parameters.condition }}
-- template: parse-os-versions.yml
+- template: parse-test-arg-arrays.yml
 - powershell: >
     $(test.init);
     $(testScriptPath)
-    -Version '$(productVersion)'
+    -Paths $(imageBuilderPathsArrayInitStr)
     -OSVersions $(osVersionsArrayInitStr)
     $(optionalTestArgs)
   displayName: Test Images

tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs

@@ -20,6 +20,8 @@ public AspnetImageTests(ITestOutputHelper outputHelper)
 
         protected override DotNetImageType ImageType => DotNetImageType.Aspnet;
 
+        public static IEnumerable<object[]> GetImageData() => GetImageData(DotNetImageType.Aspnet);
+
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]
         public async Task VerifyAppScenario(ProductImageData imageData)
@@ -70,6 +72,20 @@ public void VerifyPackageInstallation(ProductImageData imageData)
                     .Concat(RuntimeImageTests.GetExpectedRpmPackagesInstalled(imageData)));
         }
 
+        [LinuxImageTheory]
+        [MemberData(nameof(GetImageData))]
+        public void VerifyInsecureFiles(ProductImageData imageData)
+        {
+            base.VerifyCommonInsecureFiles(imageData);
+        }
+
+        [LinuxImageTheory]
+        [MemberData(nameof(GetImageData))]
+        public void VerifyShellNotInstalledForDistroless(ProductImageData imageData)
+        {
+            base.VerifyCommonShellNotInstalledForDistroless(imageData);
+        }
+
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]
         public void VerifyNoSasToken(ProductImageData imageData)

tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs

@@ -17,9 +17,9 @@ protected CommonRuntimeImageTests(ITestOutputHelper outputHelper)
         {
         }
 
-        public static IEnumerable<object[]> GetImageData()
+        public static IEnumerable<object[]> GetImageData(DotNetImageType imageType)
         {
-            return TestData.GetImageData()
+            return TestData.GetImageData(imageType)
                 .Select(imageData => new object[] { imageData });
         }
 
@@ -46,16 +46,7 @@ protected void VerifyCommonEnvironmentVariables(
             EnvironmentVariableInfo.Validate(variables, imageTag, imageData, DockerHelper);
         }
 
-        [LinuxImageTheory]
-        [MemberData(nameof(GetImageData))]
-        public void VerifyInsecureFiles(ProductImageData imageData)
-        {
-            base.VerifyCommonInsecureFiles(imageData);
-        }
-
-        [LinuxImageTheory]
-        [MemberData(nameof(GetImageData))]
-        public void VerifyShellNotInstalledForDistroless(ProductImageData imageData)
+        public void VerifyCommonShellNotInstalledForDistroless(ProductImageData imageData)
         {
             if (!imageData.IsDistroless)
             {

tests/Microsoft.DotNet.Docker.Tests/Config.cs

@@ -34,6 +34,9 @@ public static class Config
             Environment.GetEnvironmentVariable("SAS_QUERY_STRING") ?? string.Empty;
         public static string NuGetFeedPassword { get; } =
             Environment.GetEnvironmentVariable("NUGET_FEED_PASSWORD") ?? string.Empty;
+        public static string[] Paths { get; } =
+            Environment.GetEnvironmentVariable("DOCKERFILE_PATHS")?
+                .Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
 
         public static bool IsInternal(string dotnetVersion)
         {

tests/Microsoft.DotNet.Docker.Tests/DotNetImageType.cs

@@ -10,5 +10,6 @@ public enum DotNetImageType
         Runtime,
         Runtime_Deps,
         Aspnet,
+        Monitor
     }
 }

tests/Microsoft.DotNet.Docker.Tests/ImageData.cs

@@ -147,22 +147,23 @@ protected string GetTagName(string tagPrefix, string os) =>
 
         protected virtual string GetArchTagSuffix()
         {
-            if (Arch == Arch.Amd64 && DockerHelper.IsLinuxContainerModeEnabled)
+            if (Arch == Arch.Amd64 && !DockerHelper.IsLinuxContainerModeEnabled)
             {
-                return "-amd64";
-            }
-            else if (Arch == Arch.Arm)
-            {
-                return "-arm32v7";
-            }
-            else if (Arch == Arch.Arm64)
-            {
-                return "-arm64v8";
+                return string.Empty;
             }
 
-            return string.Empty;
+            return $"-{GetArchLabel()}";
         }
 
+        protected string GetArchLabel() =>
+            Arch switch
+            {
+                Arch.Amd64 => "amd64",
+                Arch.Arm => "arm32v7",
+                Arch.Arm64 => "arm64v8",
+                _ => throw new NotSupportedException()
+            };
+
         private static string GetRegistryName(string repo, string tag)
         {
             bool imageExistsInStaging = true;