implement skipping tests if containerd image store is not enabled

Author: Surayya Huseyn Zada

src/Containers/Microsoft.NET.Build.Containers/LocalDaemons/DockerCli.cs

@@ -625,7 +625,7 @@ private static bool IsPodmanAlias()
         }
     }
 
-    private static bool IsContainerdStoreEnabledForDocker()
+    internal static bool IsContainerdStoreEnabledForDocker()
     {
         try
         {

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ContainerCli.cs

@@ -9,6 +9,8 @@ static class ContainerCli
 
     public static bool IsAvailable => _isAvailable.Value;
 
+    public static bool IsContainerdStoreEnabledForDocker => DockerCli.IsContainerdStoreEnabledForDocker();
+
     public static RunExeCommand PullCommand(ITestOutputHelper log, params string[] args)
       => CreateCommand(log, "pull", args);
 

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchFact.cs

@@ -5,12 +5,16 @@ namespace Microsoft.NET.Build.Containers.IntegrationTests;
 
 public class DockerIsAvailableAndSupportsArchFactAttribute : FactAttribute
 {
-    public DockerIsAvailableAndSupportsArchFactAttribute(string arch)
+    public DockerIsAvailableAndSupportsArchFactAttribute(string arch, bool checkContainerdStoreAvailability = false)
     {
         if (!DockerSupportsArchHelper.DaemonIsAvailable)
         {
             base.Skip = "Skipping test because Docker is not available on this host.";
         }
+        else if (checkContainerdStoreAvailability && !DockerSupportsArchHelper.IsContainerdStoreEnabledForDocker)
+        {
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
+        }
         else if (!DockerSupportsArchHelper.DaemonSupportsArch(arch))
         {
             base.Skip = $"Skipping test because Docker daemon does not support {arch}.";

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerSupportsArchInlineData.cs

@@ -36,6 +36,8 @@ internal static class DockerSupportsArchHelper
 {
     internal static bool DaemonIsAvailable => ContainerCli.IsAvailable;
 
+    internal static bool IsContainerdStoreEnabledForDocker => ContainerCli.IsContainerdStoreEnabledForDocker;
+
     internal static bool DaemonSupportsArch(string arch)
     {
         // an optimization - this doesn't change over time so we can compute it once

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -722,7 +722,7 @@ public void EndToEnd_SingleArch_NoRid()
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_LocalRegistry()
     {
         string imageName = NewImageName();
@@ -905,7 +905,7 @@ private DirectoryInfo CreateNewProject(string template, [CallerMemberName] strin
     private string GetPublishArtifactsPath(string projectDir, string rid, string configuration = "Debug")
         => Path.Combine(projectDir, "bin", configuration, ToolsetInfo.CurrentTargetFramework, rid, "publish");
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_ArchivePublishing()
     {
         string imageName = NewImageName();
@@ -974,7 +974,7 @@ public void EndToEndMultiArch_ArchivePublishing()
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_RemoteRegistry()
     {
         string imageName = NewImageName();
@@ -1053,7 +1053,7 @@ public void EndToEndMultiArch_RemoteRegistry()
         newProjectDir.Delete(true);
     }
 
-    [DockerAvailableFact]
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentifiers()
     {
         // Create a new console project
@@ -1088,7 +1088,7 @@ public void EndToEndMultiArch_ContainerRuntimeIdentifiersOverridesRuntimeIdentif
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_EnvVariables()
     {
         string imageName = NewImageName();
@@ -1158,7 +1158,7 @@ public void EndToEndMultiArch_EnvVariables()
         newProjectDir.Delete(true);
     }
 
-    [DockerIsAvailableAndSupportsArchFact("linux/arm64")]
+    [DockerIsAvailableAndSupportsArchFact("linux/arm64", checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_Ports()
     {
         string imageName = NewImageName();
@@ -1256,7 +1256,7 @@ private void CheckPorts(string containerName, int[] correctPorts, int[] incorrec
         }
     }
 
-    [DockerAvailableFact]
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
     public void EndToEndMultiArch_Labels()
     {
         string imageName = NewImageName();

src/Tests/Microsoft.NET.Build.Containers.UnitTests/DockerAvailableUtils.cs

@@ -25,17 +25,20 @@ public class DockerAvailableFactAttribute : FactAttribute
 {
     public static string LocalRegistry => DockerCliStatus.LocalRegistry;
 
-    public DockerAvailableFactAttribute(bool skipPodman = false)
+    public DockerAvailableFactAttribute(bool skipPodman = false, bool checkContainerdStoreAvailability = false)
     {
         if (!DockerCliStatus.IsAvailable)
         {
             base.Skip = "Skipping test because Docker is not available on this host.";
         }
-
-        if (skipPodman && DockerCliStatus.Command == DockerCli.PodmanCommand)
+        else if (checkContainerdStoreAvailability && !DockerCli.IsContainerdStoreEnabledForDocker())
         {
-            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
+            base.Skip = "Skipping test because Docker daemon is not using containerd as the storage driver.";
         }
+        else if (skipPodman && DockerCliStatus.Command == DockerCli.PodmanCommand)
+        {
+            base.Skip = $"Skipping test with {DockerCliStatus.Command} cli.";
+        }      
     }
 }