Revert "Fix spring autoconfigure test"

sdk/spring/ci.yml

@@ -600,9 +600,3 @@ extends:
         skipPublishDocGithubIo: true
         skipPublishDocMs: true
         releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }}
-    PreBuildSteps:
-      # AzureRedisAutoConfigurationTestContainerTest pulls in `ryuk` image because of testcontainers dependency.
-      # `ryuk` does not exist in mcr.microsoft.com image repository. Do not pull image.
-      - bash: |
-          echo "##vso[task.setvariable variable=TESTCONTAINERS_RYUK_DISABLED;]true"
-        displayName: 'Disable testcontainers ryuk'

sdk/spring/pipeline/compatibility-tests-job.yml

@@ -24,11 +24,6 @@ jobs:
       - script: |
           python -m pip install termcolor
         displayName: 'Python module install'
-      # AzureRedisAutoConfigurationTestContainerTest pulls in `ryuk` image because of testcontainers dependency.
-      # `ryuk` does not exist in mcr.microsoft.com image repository. Do not pull image.
-      - bash: |
-          echo "##vso[task.setvariable variable=TESTCONTAINERS_RYUK_DISABLED;]true"
-        displayName: 'Disable testcontainers ryuk'
       - bash: |
           echo "##vso[task.setVariable variable=SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION]$(python ./sdk/spring/scripts/compatibility_get_spring_cloud_version.py -b $(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION))"
         displayName: 'Set env'

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/redis/passwordless/data/jedis/AzureRedisAutoConfigurationTestContainerTest.java

@@ -5,15 +5,12 @@
 
 import com.azure.identity.extensions.implementation.template.AzureAuthenticationTemplate;
 import com.azure.spring.cloud.autoconfigure.redis.AzureJedisPasswordlessAutoConfiguration;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -24,6 +21,7 @@
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
@@ -35,7 +33,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @Testcontainers
-@DisabledOnOs({OS.WINDOWS, OS.MAC})
+@Disabled("Disable for Container startup failed")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class AzureRedisAutoConfigurationTestContainerTest {
 
@@ -44,34 +42,17 @@ public class AzureRedisAutoConfigurationTestContainerTest {
 
     private static final String REDIS_PASSWORD = "fake-testcontainer-password";
 
-    /**
-     * Pulling Docker registry name from testcontainers.properties file as prefix.
-     */
-    private static final GenericContainer<?> REDIS;
+    @Container
+    private static GenericContainer<?> redis =
+        new GenericContainer<>(DockerImageName.parse("redis:5.0.3-alpine"))
+            .withCommand("--requirepass", REDIS_PASSWORD)
+            .withExposedPorts(6379);
 
-    static {
-        System.out.println("TESTCONTAINERS_RYUK_DISABLED value: [" + System.getenv("TESTCONTAINERS_RYUK_DISABLED") + "]");
-
-        REDIS =
-            new GenericContainer<>(DockerImageName.parse("redis:6"))
-                .withCommand("--requirepass", REDIS_PASSWORD)
-                .withExposedPorts(6379);
-    }
-
-    @BeforeAll
-    public static void beforeAll() {
-        REDIS.start();
-    }
-
-    @AfterAll
-    public static void afterAll() {
-        REDIS.stop();
-    }
 
     @DynamicPropertySource
     static void redisProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.redis.host", REDIS::getHost);
-        registry.add("spring.redis.port", REDIS::getFirstMappedPort);
+        registry.add("spring.redis.host", redis::getHost);
+        registry.add("spring.redis.port", redis::getFirstMappedPort);
         registry.add("spring.redis.ssl", () -> false);
         registry.add("spring.redis.azure.passwordless-enabled", () -> true);
     }
@@ -91,11 +72,12 @@ void testSetAndGet() {
 
     @Test
     @Order(2)
-    void testGetValueAfterSet() {
+    void testGetVauleAfterSet() {
         String value = (String) redisTemplate.opsForValue().get("valueMap3");
         Assertions.assertEquals("map3", value);
     }
 
+
     @Configuration
     @Import({AzureJedisPasswordlessAutoConfiguration.class, RedisAutoConfiguration.class})
     static class AzureRedisPasswordlessTestConfig {

sdk/spring/tests.yml

@@ -6,8 +6,6 @@ extends:
     stages:
       - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml
         parameters:
-          EnvVars:
-            TESTCONTAINERS_RYUK_DISABLED: true
           UseFederatedAuth: true
           SupportedClouds: "Public,UsGov,China"
           Clouds: "Public"
@@ -45,8 +43,6 @@ extends:
           TestOptions: "-DskipSpringITs=false"
       - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml
         parameters:
-          EnvVars:
-            TESTCONTAINERS_RYUK_DISABLED: true
           UseFederatedAuth: true
           SupportedClouds: 'Public,UsGov,China'
           Clouds: 'Public'
@@ -74,8 +70,6 @@ extends:
           TestGoals: 'verify'
       - template: /eng/pipelines/templates/stages/archetype-sdk-tests-isolated.yml
         parameters:
-          EnvVars:
-            TESTCONTAINERS_RYUK_DISABLED: true
           UseFederatedAuth: true
           SupportedClouds: 'Public,UsGov'
           Clouds: 'Public'
@@ -106,3 +100,4 @@ extends:
           TestName: 'Spring_Data_Cosmos_Integration'
           TestGoals: 'clean verify'
           TestOptions: '$(ProfileFlag)'
+