Downgrade docker image used in couchbase 3.1 tests (#12925)
This commit is contained in:
parent
342400dd65
commit
02efad2ab9
|
@ -5,11 +5,8 @@
|
||||||
|
|
||||||
package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;
|
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.env.TimeoutConfig;
|
||||||
import com.couchbase.client.core.error.DocumentNotFoundException;
|
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.Bucket;
|
||||||
import com.couchbase.client.java.Cluster;
|
import com.couchbase.client.java.Cluster;
|
||||||
import com.couchbase.client.java.ClusterOptions;
|
import com.couchbase.client.java.ClusterOptions;
|
||||||
|
@ -44,20 +41,8 @@ class CouchbaseClient31Test {
|
||||||
|
|
||||||
@BeforeAll
|
@BeforeAll
|
||||||
static void setup() {
|
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 =
|
couchbase =
|
||||||
new CouchbaseContainer("couchbase/server:7.6.0")
|
new CouchbaseContainer("couchbase/server:6.5.1")
|
||||||
.withExposedPorts(8091)
|
.withExposedPorts(8091)
|
||||||
.withEnabledServices(CouchbaseService.KV)
|
.withEnabledServices(CouchbaseService.KV)
|
||||||
.withBucket(new BucketDefinition("test"))
|
.withBucket(new BucketDefinition("test"))
|
||||||
|
|
Loading…
Reference in New Issue