Switch to pre-built Cassandra Docker image (dotnet#9076)

* Switch to pre-built Cassandra Docker image Removed `Cassandra.dockerfile` and related custom image build code. Updated `CassandraContainer.cs` to use a pre-built Cassandra image from Docker Hub, specified by the `CASSANDRAVERSION` environment variable. * Matching category to run clustering tests * Update .github/workflows/ci.yml --------- Co-authored-by: Reuben Bond <[email protected]>
benjaminpetit · Jul 25, 2024 · 0de83d2 · 0de83d2
1 parent 92e0bf3
commit 0de83d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
           3.1.x
           8.0.x
     - name: Test
-      run: dotnet test --filter "Category=${{ matrix.provider }}&(Category=BVT|Category=SlowBVT|Category=Functional)" --blame-hang-timeout 10m --logger "trx" -- -parallel none -noshadow
+      run: dotnet test --filter "Category=${{ matrix.provider }}&(Category=BVT|Category=SlowBVT|Category=Clustering)" --blame-hang-timeout 10m --logger "trx" -- -parallel none -noshadow
       env:
         CASSANDRAVERSION: ${{ matrix.dbversion }}
     - name: Archive Test Results

diff --git a/test/Extensions/Tester.Cassandra/Cassandra.dockerfile b/test/Extensions/Tester.Cassandra/Cassandra.dockerfile
diff --git a/test/Extensions/Tester.Cassandra/Clustering/CassandraContainer.cs b/test/Extensions/Tester.Cassandra/Clustering/CassandraContainer.cs
@@ -12,24 +12,14 @@ public class CassandraContainer
     private readonly Lazy<Task<(IContainer container, ushort exposedPort, Cluster cluster, ISession session)>> _innerRunImage =
         new(async () =>
         {
-            var cassandraImage = new ImageFromDockerfileBuilder()
-                .WithDockerfileDirectory(CommonDirectoryPath.GetProjectDirectory(Directory.GetCurrentDirectory()), string.Empty)
-                .WithDockerfile("Cassandra.dockerfile")
-                .WithBuildArgument("CASSANDRAVERSION", Environment.GetEnvironmentVariable("CASSANDRAVERSION"))
-                .Build();
-
-            var imageTask = cassandraImage.CreateAsync();
-
-            await imageTask;
-
             var containerPort = 9042;
 
-            var builder = new ContainerBuilder()
-                .WithImage(cassandraImage)
-                .WithPortBinding(containerPort, true)
-                .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(containerPort));
-
-            var container = builder.Build();
+            var container = new ContainerBuilder()
+                    .WithImage("cassandra:" + Environment.GetEnvironmentVariable("CASSANDRAVERSION"))
+                    .WithPortBinding(containerPort, true)
+                    .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(containerPort))
+                    .Build()
+                ;
 
             await container.StartAsync();
 

diff --git a/test/Extensions/Tester.Cassandra/Tester.Cassandra.csproj b/test/Extensions/Tester.Cassandra/Tester.Cassandra.csproj
@@ -16,10 +16,4 @@
 
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Cassandra.dockerfile">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>