Skip to content

Commit 92db570

Browse files
committed
use a separate test run
1 parent 9aef8d3 commit 92db570

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ jobs:
338338
id: get-matrix
339339
run: |
340340
includes=""
341-
for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx"; do
341+
for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx" "envoy"; do
342342
for arch in "amd64" "arm64"; do
343343
if [ "$service" = "mongodb" ]; then
344344
# tests for mongo "6.0" and "7.0" are flaky, skipping for now

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ integration-test-jmx/cassandra-discovery:
103103
integration-test-apache-discovery:
104104
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_apachewebserver -v -timeout 5m -count 1 ./...
105105

106+
.PHONY: integration-test-envoy-discovery
107+
integration-test-envoy-discovery:
108+
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_envoy -v -timeout 5m -count 1 ./...
109+
106110
.PHONY: integration-test-nginx-discovery
107111
integration-test-nginx-discovery:
108112
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_nginx -v -timeout 5m -count 1 ./...

docker/docker-compose.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,10 @@ services:
8383
envoy:
8484
image: quay.io/splunko11ytest/envoy:latest
8585
profiles:
86-
- envoy_discovery
86+
- integration-test-envoy-discovery
8787
build: ./envoy
8888
ports:
8989
- "9901:9901"
90-
networks:
91-
- envoy
9290
# Haproxy image for haproxy test:
9391
haproxy:
9492
image: quay.io/splunko11ytest/haproxy:latest
@@ -318,7 +316,3 @@ services:
318316
interval: 10s
319317
timeout: 5s
320318
retries: 5
321-
networks:
322-
envoy:
323-
driver: bridge
324-
name: envoy

tests/receivers/envoy/bundled_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
//go:build envoy_discovery
15+
//go:build discovery_integration_envoy
1616

1717
package tests
1818

@@ -43,7 +43,6 @@ func TestEnvoyDockerObserver(t *testing.T) {
4343
defer tc.ShutdownOTLPReceiverSink()
4444
_, shutdown := tc.SplunkOtelCollectorContainer("otlp_exporter.yaml", func(collector testutils.Collector) testutils.Collector {
4545
cc := collector.(*testutils.CollectorContainer)
46-
cc.Container = cc.Container.WithNetworks("envoy").WithNetworkMode("bridge")
4746
return cc.WithEnv(map[string]string{
4847
"SPLUNK_DISCOVERY_DURATION": "20s",
4948
"SPLUNK_DISCOVERY_LOG_LEVEL": "debug",

0 commit comments

Comments
 (0)