diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 2601402af9..099847f8d8 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -258,7 +258,7 @@ jobs: strategy: matrix: RUNNER: [ "ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04" ] - PROFILE: [ "integration", "smartagent", "redis_discovery" ] + PROFILE: [ "integration", "smartagent" ] fail-fast: false env: TEST_OUTPUT: ${{ github.job }}-${{ matrix.PROFILE }}-${{ matrix.RUNNER }}.out @@ -338,7 +338,7 @@ jobs: id: get-matrix run: | includes="" - for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx" "envoy"; do + for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx" "envoy" "redis"; do for arch in "amd64" "arm64"; do if [ "$service" = "mongodb" ]; then # tests for mongo "6.0" and "7.0" are flaky, skipping for now diff --git a/Makefile b/Makefile index 5e240f6ebb..5257672559 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,10 @@ integration-test-envoy-discovery: integration-test-nginx-discovery: @set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_nginx -v -timeout 5m -count 1 ./... +.PHONY: integration-test-redis-discovery +integration-test-redis-discovery: + @set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_redis -v -timeout 5m -count 1 ./... + .PHONY: smartagent-integration-test smartagent-integration-test: @set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=smartagent_integration -v -timeout 5m -count 1 ./... diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 614acdd45b..fa4d39c597 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -279,12 +279,10 @@ services: image: quay.io/splunko11ytest/redis_server:latest profiles: - integration - - redis_discovery + - integration-test-redis-discovery build: ./redis_server ports: - "6379:6379" - networks: - - redis solr: image: quay.io/splunko11ytest/solr:latest profiles: @@ -319,7 +317,3 @@ services: interval: 10s timeout: 5s retries: 5 -networks: - redis: - name: redis - driver: bridge diff --git a/tests/receivers/redis/bundled_test.go b/tests/receivers/redis/bundled_test.go index e519daae67..0d344253c2 100644 --- a/tests/receivers/redis/bundled_test.go +++ b/tests/receivers/redis/bundled_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build redis_discovery +//go:build discovery_integration_redis package tests @@ -45,7 +45,6 @@ func TestRedisDockerObserver(t *testing.T) { _, shutdown := tc.SplunkOtelCollectorContainer("otlp_exporter.yaml", func(c testutils.Collector) testutils.Collector { cc := c.(*testutils.CollectorContainer) cc.Container = cc.Container.WillWaitForLogs("Discovering for next") - cc.Container = cc.Container.WithNetworkMode("bridge").WithNetworks("redis") return cc }, func(collector testutils.Collector) testutils.Collector {