Use weblog infra for haproxy and envoy integrations (#7179)

Author: cbeauchesne

.github/workflows/run-end-to-end.yml

@@ -112,6 +112,7 @@ jobs:
       SYSTEM_TESTS_SKIP_EMPTY_SCENARIO: ${{ inputs.skip_empty_scenarios }}
       SYSTEM_TESTS_FORCE_EXECUTE: ${{ inputs.force_execute }}
       SYSTEM_TESTS_DEV_MODE: ${{ inputs._system_tests_dev_mode }}
+      SYSTEM_TESTS_WEBLOG:  ${{ inputs.weblog }}
     steps:
     - name: Compute ref
       id: compute_ref
@@ -516,12 +517,6 @@ jobs:
     - name: Run APPSEC_LAMBDA_INFERRED_SPANS scenario
       if: steps.build.outcome == 'success' && !cancelled() && contains(inputs.scenarios, '"APPSEC_LAMBDA_INFERRED_SPANS"')
       run: ./run.sh APPSEC_LAMBDA_INFERRED_SPANS
-    - name: Run GO_PROXIES_DEFAULT scenario
-      if: steps.build.outcome == 'success' && !cancelled() && contains(inputs.scenarios, '"GO_PROXIES_DEFAULT"')
-      run: ./run.sh GO_PROXIES_DEFAULT --weblog ${{ inputs.weblog }}
-    - name: Run GO_PROXIES_APPSEC_BLOCKING scenario
-      if: steps.build.outcome == 'success' && !cancelled() && contains(inputs.scenarios, '"GO_PROXIES_APPSEC_BLOCKING"')
-      run: ./run.sh GO_PROXIES_APPSEC_BLOCKING --weblog ${{ inputs.weblog }}
     - name: Run OTEL_COLLECTOR scenario
       if: steps.build.outcome == 'success' && !cancelled() && contains(inputs.scenarios, '"OTEL_COLLECTOR"')
       run: ./run.sh OTEL_COLLECTOR

conftest.py

@@ -195,6 +195,9 @@ def pytest_configure(config: pytest.Config) -> None:
     if not config.option.force_execute and "SYSTEM_TESTS_FORCE_EXECUTE" in os.environ:
         config.option.force_execute = os.environ["SYSTEM_TESTS_FORCE_EXECUTE"].strip().split(",")
 
+    if not config.option.weblog and os.environ.get("SYSTEM_TESTS_WEBLOG"):
+        config.option.weblog = os.environ.get("SYSTEM_TESTS_WEBLOG")
+
     if not config.option.library and "TEST_LIBRARY" in os.environ:
         config.option.library = os.environ["TEST_LIBRARY"].strip()