Skip to content

Commit

Permalink
simplify by running the test in isolation
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Jan 12, 2025
1 parent 23c096c commit 7e2a8d0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
8 changes: 1 addition & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -319,7 +317,3 @@ services:
interval: 10s
timeout: 5s
retries: 5
networks:
redis:
name: redis
driver: bridge
3 changes: 1 addition & 2 deletions tests/receivers/redis/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 redis_discovery
//go:build discovery_integration_redis

package tests

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 7e2a8d0

Please sign in to comment.