From 45282ed54c4df9e9db22a742deeaab266fcce14c Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 26 Dec 2023 12:03:32 +0100 Subject: [PATCH 1/2] OnBoarding: Push results to FPD --- .gitlab-ci.yml | 4 ++-- tests/onboarding/test_onboarding_install.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bda1df777d..f60bbb1906e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - java_tracer - python_tracer - dotnet_tracer - #- parse_results + - parse_results .base_job_onboarding: only: @@ -146,7 +146,7 @@ onboarding_ruby: - ./build.sh -i runner - timeout 2700s ./run.sh $SCENARIO --obd-weblog ${ONBOARDING_FILTER_WEBLOG} --obd-env ${ONBOARDING_FILTER_ENV} --obd-library ${TEST_LIBRARY} -.onboarding_parse_results: +onboarding_parse_results: image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/test-infra-definitions/runner:a58cc31c tags: ["arch:amd64"] stage: parse_results diff --git a/tests/onboarding/test_onboarding_install.py b/tests/onboarding/test_onboarding_install.py index 6c80832827d..d39e65aaf64 100644 --- a/tests/onboarding/test_onboarding_install.py +++ b/tests/onboarding/test_onboarding_install.py @@ -2,9 +2,8 @@ import pytest -from utils import scenarios, context +from utils import scenarios, context, features from utils.tools import logger - from utils.onboarding.weblog_interface import make_get_request from utils.onboarding.backend_interface import wait_backend_trace_id from utils.onboarding.wait_for_tcp_port import wait_for_port @@ -44,21 +43,25 @@ def test_no_traces_after_uninstall(self, onboardig_vm): pass +@features.container_auto_instrumentation @scenarios.onboarding_container_install_manual class TestOnboardingInstallManualContainer(_OnboardingInstallBaseTest): pass +@features.host_auto_instrumentation @scenarios.onboarding_host_install_manual class TestOnboardingInstallManualHost(_OnboardingInstallBaseTest): pass +@features.host_auto_instrumentation @scenarios.onboarding_host_install_script class TestOnboardingInstallScriptHost(_OnboardingInstallBaseTest): pass +@features.container_auto_instrumentation @scenarios.onboarding_container_install_script class TestOnboardingInstallScriptContainer(_OnboardingInstallBaseTest): pass @@ -69,11 +72,13 @@ class TestOnboardingInstallScriptContainer(_OnboardingInstallBaseTest): ######################### +@features.container_auto_instrumentation @scenarios.onboarding_container_uninstall class TestOnboardingUninstallContainer(_OnboardingUninstallBaseTest): pass +@features.host_auto_instrumentation @scenarios.onboarding_host_uninstall class TestOnboardingUninstallHost(_OnboardingUninstallBaseTest): pass From 57f38ff47dcf9b7166648517ba090bc635d22de9 Mon Sep 17 00:00:00 2001 From: roberto montero Date: Tue, 26 Dec 2023 15:32:19 +0100 Subject: [PATCH 2/2] remove test_onboarding_install.py from pyproject/allow_no_feature_nodes --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fd8ad51137d..8569af03c49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,6 @@ allow_no_feature_nodes = [ "tests/apm_tracing_e2e/test_otel.py", "tests/apm_tracing_e2e/test_single_span.py", "tests/apm_tracing_e2e/test_smoke.py", - "tests/onboarding/test_onboarding_install.py", "tests/otel_tracing_e2e/test_e2e.py", "tests/parametric/test_128_bit_traceids.py", "tests/parametric/test_headers_none.py",