Skip to content

Commit d00403b

Browse files
committed
Simplify build and use docker images directly
1 parent 8a02314 commit d00403b

File tree

6 files changed

+6
-69
lines changed

6 files changed

+6
-69
lines changed

.github/workflows/docker-test-containers-daily.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
class CollectorIntegrationTest {
6161

6262
private static final String COLLECTOR_IMAGE =
63-
"ghcr.io/open-telemetry/opentelemetry-java/otel-collector" + collectorVersion();
63+
"otel/opentelemetry-collector-contrib" + collectorVersion();
6464

6565
private static String collectorVersion() {
6666
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ abstract class OtlpExporterIntegrationTest {
115115
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
116116

117117
private static final String COLLECTOR_IMAGE =
118-
"ghcr.io/open-telemetry/opentelemetry-java/otel-collector" + collectorVersion();
118+
"otel/opentelemetry-collector-contrib" + collectorVersion();
119119

120120
private static String collectorVersion() {
121121
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");

integration-tests/tracecontext/src/test/java/io/opentelemetry/integrationtests/tracecontext/TraceContextIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ class TraceContextIntegrationTest {
2424

2525
@Container
2626
private static final GenericContainer<?> appContainer =
27-
new GenericContainer<>(
28-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/openjdk17"))
27+
new GenericContainer<>(DockerImageName.parse("eclipse-temurin:17-jre-focal"))
2928
.withExposedPorts(5000)
3029
.withNetwork(Network.SHARED)
3130
.withNetworkAliases("app")

perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.testcontainers.containers.Network;
4949
import org.testcontainers.containers.output.Slf4jLogConsumer;
5050
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
51-
import org.testcontainers.images.PullPolicy;
5251
import org.testcontainers.junit.jupiter.Container;
5352
import org.testcontainers.junit.jupiter.Testcontainers;
5453
import org.testcontainers.utility.DockerImageName;
@@ -68,9 +67,7 @@ public class OtlpPipelineStressTest {
6867

6968
@Container
7069
public static final GenericContainer<?> collectorContainer =
71-
new GenericContainer<>(
72-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/otel-collector"))
73-
.withImagePullPolicy(PullPolicy.alwaysPull())
70+
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
7471
.withNetwork(network)
7572
.withNetworkAliases("otel-collector")
7673
.withExposedPorts(OTLP_RECEIVER_PORT)
@@ -94,9 +91,7 @@ public class OtlpPipelineStressTest {
9491

9592
@Container
9693
public static final GenericContainer<?> toxiproxyContainer =
97-
new GenericContainer<>(
98-
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/toxiproxy"))
99-
.withImagePullPolicy(PullPolicy.alwaysPull())
94+
new GenericContainer<>(DockerImageName.parse("shopify/toxiproxy:latest"))
10095
.withNetwork(network)
10196
.withNetworkAliases("toxiproxy")
10297
.withExposedPorts(TOXIPROXY_CONTROL_PORT, COLLECTOR_PROXY_PORT)

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerIntegrationTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.BindMode;
2121
import org.testcontainers.containers.GenericContainer;
2222
import org.testcontainers.containers.wait.strategy.Wait;
23-
import org.testcontainers.images.PullPolicy;
2423
import org.testcontainers.junit.jupiter.Container;
2524
import org.testcontainers.junit.jupiter.Testcontainers;
2625

@@ -36,8 +35,7 @@ class JaegerRemoteSamplerIntegrationTest {
3635

3736
@Container
3837
public static final GenericContainer<?> jaegerContainer =
39-
new GenericContainer<>("ghcr.io/open-telemetry/opentelemetry-java/jaeger:1.32")
40-
.withImagePullPolicy(PullPolicy.alwaysPull())
38+
new GenericContainer<>("jaegertracing/all-in-one:1.32")
4139
.withCommand("--sampling.strategies-file=/sampling.json")
4240
.withExposedPorts(COLLECTOR_PORT, QUERY_PORT, HEALTH_PORT)
4341
.waitingFor(Wait.forHttp("/").forPort(HEALTH_PORT))

0 commit comments

Comments
 (0)