use a separate test run

Author: atoulme

.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", "envoy_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" "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

Makefile

@@ -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 ./...

docker/docker-compose.yml

@@ -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
@@ -318,7 +316,3 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-networks:
-  envoy:
-    driver: bridge
-    name: envoy

tests/general/discoverymode/docker_observer_discovery_test.go

@@ -74,10 +74,10 @@ func TestDockerObserver(t *testing.T) {
 				// runner seems to be slow
 				"SPLUNK_DISCOVERY_DURATION": "20s",
 				// confirm that debug logging doesn't affect runtime
-				//"SPLUNK_DISCOVERY_LOG_LEVEL": "debug",
-				"DOCKER_DOMAIN_SOCKET": fmt.Sprintf("tcp://%s", dockerSocketProxy.ContainerEndpoint),
-				"LABEL_ONE_VALUE":      "actual.label.one.value",
-				"LABEL_TWO_VALUE":      "actual.label.two.value",
+				"SPLUNK_DISCOVERY_LOG_LEVEL": "debug",
+				"DOCKER_DOMAIN_SOCKET":       fmt.Sprintf("tcp://%s", dockerSocketProxy.ContainerEndpoint),
+				"LABEL_ONE_VALUE":            "actual.label.one.value",
+				"LABEL_TWO_VALUE":            "actual.label.two.value",
 				"SPLUNK_DISCOVERY_RECEIVERS_prometheus_x5f_simple_CONFIG_labels_x3a__x3a_label_x5f_three": "overwritten by --set property",
 				"SPLUNK_DISCOVERY_RECEIVERS_prometheus_x5f_simple_CONFIG_labels_x3a__x3a_label_x5f_four":  "actual.label.four.value",
 			}).WithArgs(

tests/receivers/envoy/bundled_test.go

@@ -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
 
@@ -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",