Skip to content

Commit

Permalink
use a separate test run
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Jan 12, 2025
1 parent 9aef8d3 commit 92db570
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ jobs:
id: get-matrix
run: |
includes=""
for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx"; do
for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx" "envoy"; do
for arch in "amd64" "arm64"; do
if [ "$service" = "mongodb" ]; then
# tests for mongo "6.0" and "7.0" are flaky, skipping for now
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ integration-test-jmx/cassandra-discovery:
integration-test-apache-discovery:
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_apachewebserver -v -timeout 5m -count 1 ./...

.PHONY: integration-test-envoy-discovery
integration-test-envoy-discovery:
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_envoy -v -timeout 5m -count 1 ./...

.PHONY: integration-test-nginx-discovery
integration-test-nginx-discovery:
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_nginx -v -timeout 5m -count 1 ./...
Expand Down
8 changes: 1 addition & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,10 @@ services:
envoy:
image: quay.io/splunko11ytest/envoy:latest
profiles:
- envoy_discovery
- integration-test-envoy-discovery
build: ./envoy
ports:
- "9901:9901"
networks:
- envoy
# Haproxy image for haproxy test:
haproxy:
image: quay.io/splunko11ytest/haproxy:latest
Expand Down Expand Up @@ -318,7 +316,3 @@ services:
interval: 10s
timeout: 5s
retries: 5
networks:
envoy:
driver: bridge
name: envoy
3 changes: 1 addition & 2 deletions tests/receivers/envoy/bundled_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build envoy_discovery
//go:build discovery_integration_envoy

package tests

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

0 comments on commit 92db570

Please sign in to comment.