Skip to content

Commit 02efad2

Browse files
authored
Downgrade docker image used in couchbase 3.1 tests (#12925)
1 parent 342400d commit 02efad2

File tree

1 file changed

+1
-16
lines changed
  • instrumentation/couchbase/couchbase-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1

1 file changed

+1
-16
lines changed

instrumentation/couchbase/couchbase-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseClient31Test.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;
77

8-
import static org.awaitility.Awaitility.await;
9-
108
import com.couchbase.client.core.env.TimeoutConfig;
119
import com.couchbase.client.core.error.DocumentNotFoundException;
12-
import com.couchbase.client.core.error.UnambiguousTimeoutException;
1310
import com.couchbase.client.java.Bucket;
1411
import com.couchbase.client.java.Cluster;
1512
import com.couchbase.client.java.ClusterOptions;
@@ -44,20 +41,8 @@ class CouchbaseClient31Test {
4441

4542
@BeforeAll
4643
static void setup() {
47-
// wait and retry in the hope that it will help against test flakiness
48-
await()
49-
.atMost(Duration.ofMinutes(5))
50-
.ignoreException(UnambiguousTimeoutException.class)
51-
.until(
52-
() -> {
53-
startCouchbase();
54-
return true;
55-
});
56-
}
57-
58-
private static void startCouchbase() {
5944
couchbase =
60-
new CouchbaseContainer("couchbase/server:7.6.0")
45+
new CouchbaseContainer("couchbase/server:6.5.1")
6146
.withExposedPorts(8091)
6247
.withEnabledServices(CouchbaseService.KV)
6348
.withBucket(new BucketDefinition("test"))

0 commit comments

Comments
 (0)