Skip to content

Commit 1d51baf

Browse files
Ignore aerospike on arm64 Linux.
1 parent 482ade9 commit 1d51baf

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

  • dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4

dd-java-agent/instrumentation/aerospike-4.0/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeBaseTest.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package datadog.trace.instrumentation.aerospike4
22

3-
import static datadog.environment.OperatingSystem.arm64
3+
import static datadog.environment.OperatingSystem.isArm64
4+
import static datadog.environment.OperatingSystem.isLinux
45
import static datadog.trace.agent.test.utils.PortUtils.waitForPortToOpen
56
import static java.util.concurrent.TimeUnit.SECONDS
7+
import static org.junit.jupiter.api.Assumptions.assumeFalse
68
import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage
79

810
import datadog.trace.agent.test.asserts.TraceAssert
@@ -14,8 +16,6 @@ import org.testcontainers.containers.GenericContainer
1416
import spock.lang.Shared
1517

1618
abstract class AerospikeBaseTest extends VersionedNamingTestBase {
17-
// arm64 supported only since `ce-6.2.0.2`:
18-
private static final String AEROSPIKE_IMAGE = isArm64() ? 'aerospike:ce-6.2.0.2' : 'aerospike:5.5.0.9'
1919

2020
@Shared
2121
def aerospike
@@ -27,7 +27,10 @@ abstract class AerospikeBaseTest extends VersionedNamingTestBase {
2727
int aerospikePort = 3000
2828

2929
def setup() throws Exception {
30-
aerospike = new GenericContainer(AEROSPIKE_IMAGE)
30+
// TODO: skip aerospike under arm46 Linux, as supported since ce-6.2.0.2 only
31+
assumeFalse(isArm64() && isLinux())
32+
33+
aerospike = new GenericContainer('aerospike:5.5.0.9')
3134
.withExposedPorts(3000)
3235
.waitingFor(forLogMessage(".*heartbeat-received.*\\n", 1))
3336

0 commit comments

Comments
 (0)