Downgrade docker image used in couchbase 3.1 tests (#12925)

open-telemetry · Dec 19, 2024 · 02efad2 · 02efad2
1 parent 342400d
commit 02efad2
Showing 1 changed file with 1 addition and 16 deletions.
diff --git a/...java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseClient31Test.java b/...java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseClient31Test.java
@@ -5,11 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;
 
-import static org.awaitility.Awaitility.await;
-
 import com.couchbase.client.core.env.TimeoutConfig;
 import com.couchbase.client.core.error.DocumentNotFoundException;
-import com.couchbase.client.core.error.UnambiguousTimeoutException;
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.ClusterOptions;
@@ -44,20 +41,8 @@ class CouchbaseClient31Test {
 
   @BeforeAll
   static void setup() {
-    // wait and retry in the hope that it will help against test flakiness
-    await()
-        .atMost(Duration.ofMinutes(5))
-        .ignoreException(UnambiguousTimeoutException.class)
-        .until(
-            () -> {
-              startCouchbase();
-              return true;
-            });
-  }
-
-  private static void startCouchbase() {
     couchbase =
-        new CouchbaseContainer("couchbase/server:7.6.0")
+        new CouchbaseContainer("couchbase/server:6.5.1")
             .withExposedPorts(8091)
             .withEnabledServices(CouchbaseService.KV)
             .withBucket(new BucketDefinition("test"))