use the existing infrastructure

.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", "mysql_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"; do
+          for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx" "mysql"; do
             for arch in "amd64" "arm64"; do
               if [ "$service" = "mongodb" ]; then
                 # tests for mongo "6.0" and "7.0" are flaky, skipping for now

Makefile

@@ -91,6 +91,10 @@ integration-test:
 integration-test-mongodb-discovery:
 	@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_mongodb -v -timeout 5m -count 1 ./...
 
+.PHONY: integration-test-mysql-discovery
+integration-test-mysql-discovery:
+	@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_mysql -v -timeout 5m -count 1 ./...
+
 .PHONY: integration-test-kafkametrics-discovery
 integration-test-kafkametrics-discovery:
 	@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_kafkametrics -v -timeout 5m -count 1 ./...

docker/docker-compose.yml

@@ -241,10 +241,8 @@ services:
     image: quay.io/splunko11ytest/mysql:latest
     profiles:
       - integration
-      - mysql_discovery
       - smartagent
-    networks:
-      - mysql
+      - integration-test-mysql-discovery
     build: ./mysql
     ports:
       - "3306:3306"
@@ -311,8 +309,4 @@ services:
         ]
       interval: 10s
       timeout: 5s
-      retries: 5
-networks:
-  mysql:
-    name: mysql
-    driver: bridge
+      retries: 5

tests/receivers/mysql/bundled_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build mysql_discovery
+//go:build discovery_integration_mysql
 
 package tests
 
@@ -44,7 +44,7 @@ func TestMysqlDockerObserver(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").WithNetworkMode("bridge").WithNetworks("mysql")
+		cc.Container = cc.Container.WillWaitForLogs("Discovering for next")
 		return cc
 	},
 		func(collector testutils.Collector) testutils.Collector {