OnBoarding: de-parametrize

.gitlab/aws_gitlab-ci.yml

@@ -0,0 +1,10 @@
+stages:
+  - SCENARIOS
+
+.base_job_aws:
+  image: registry.ddbuild.io/images/ci_docker_base
+  tags: ["arch:amd64"]
+  script:
+    - echo "WEBLOG: $WEBLOG"
+    - echo "SCENARIO: $SCENARIO"
+    - echo "VIRTUAL_MACHINE: $VIRTUAL_MACHINE"

conftest.py

@@ -69,9 +69,7 @@ def pytest_addoption(parser) -> None:
     parser.addoption("--vm-library", type=str, action="store", help="Set virtual machine library to test")
     parser.addoption("--vm-env", type=str, action="store", help="Set virtual machine environment")
     parser.addoption("--vm-provider", type=str, action="store", help="Set provider for VMs")
-    parser.addoption("--vm-only-branch", type=str, action="store", help="Filter to execute only one vm branch")
     parser.addoption("--vm-only", type=str, action="store", help="Filter to execute only one vm name")
-    parser.addoption("--vm-skip-branches", type=str, action="store", help="Filter exclude vm branches")
     parser.addoption(
         "--vm-gitlab-pipeline",
         type=str,

run.sh

@@ -420,11 +420,6 @@ function main() {
         if [[ "${scenario}" == K8S_LIBRARY_INJECTION_* ]]; then
             pytest_numprocesses=$(nproc)
         fi
-        if [[ "${scenario}" == *_AUTO_INJECTION ]]; then
-            pytest_numprocesses=6
-            #https://pytest-xdist.readthedocs.io/en/latest/distribution.html
-            pytest_args+=( '--dist' 'loadgroup' )
-        fi
     done
 
     case "${pytest_numprocesses}" in

tests/auto_inject/test_auto_inject_chaos.py

@@ -1,10 +1,9 @@
 import requests
-from utils import scenarios, features, context
+from utils import scenarios, features, context, bug, irrelevant, missing_feature
 from utils.tools import logger
 from utils.onboarding.weblog_interface import warmup_weblog
 from utils.onboarding.wait_for_tcp_port import wait_for_port
 import tests.auto_inject.utils as base
-from utils.virtual_machine.utils import parametrize_virtual_machines
 
 
 class BaseAutoInjectChaos(base.AutoInjectBaseTest):
@@ -30,7 +29,7 @@ def _test_removing_things(self, virtual_machine, evil_command):
         self.execute_command(virtual_machine, evil_command)
         logger.info(f"[{virtual_machine.name}]Ok evil command launched!")
         # Assert the app is still working
-        wait_for_port(vm_port, vm_ip, 40.0)
+        assert wait_for_port(vm_port, vm_ip, 40.0), "Weblog port not reachable. Is the weblog running?"
         r = requests.get(weblog_url, timeout=10)
         assert r.status_code == 200, "The weblog app it's not working after remove the installation folder"
         logger.info(f"[{virtual_machine.name}]Ok the weblog app it's working after remove wrong things")
@@ -43,7 +42,7 @@ def _test_removing_things(self, virtual_machine, evil_command):
         # Start the app again
         self.execute_command(virtual_machine, weblog_start_command)
         # App shpuld be working again, although the installation folder was removed
-        wait_for_port(vm_port, vm_ip, 40.0)
+        assert wait_for_port(vm_port, vm_ip, 40.0), "Weblog port not reachable. Is the weblog running?"
         warmup_weblog(weblog_url)
         r = requests.get(weblog_url, timeout=10)
         assert (
@@ -87,36 +86,50 @@ def _test_removing_things(self, virtual_machine, evil_command):
 @features.installer_auto_instrumentation
 @scenarios.chaos_installer_auto_injection
 class TestAutoInjectChaos(BaseAutoInjectChaos):
-    @parametrize_virtual_machines(
-        bugs=[
-            {"vm_branch": "amazon_linux2", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            {"vm_branch": "centos_7_amd64", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            {"vm_branch": "redhat", "vm_cpu": "arm64", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            # Windows is not supported. Change to missing_feature after merge
-            {"vm_branch": "windows", "reason": "APMON-9999"},
-            {"vm_name": "Ubuntu_24_10_amd64", "weblog_variant": "test-app-python", "reason": "INPLAT-478"},
-            {"vm_name": "Ubuntu_24_10_arm64", "weblog_variant": "test-app-python", "reason": "INPLAT-478"},
-        ]
+    @bug(
+        context.vm_os_branch in ["amazon_linux2", "centos_7_amd64"] and context.weblog_variant == "test-app-ruby",
+        reason="INPLAT-103",
     )
-    def test_install_after_ld_preload(self, virtual_machine):
+    @bug(
+        context.vm_os_branch == "redhat" and context.vm_os_cpu == "arm64" and context.weblog_variant == "test-app-ruby",
+        reason="INPLAT-103",
+    )
+    @irrelevant(
+        context.vm_name in ["Amazon_Linux_2023_amd64", "Amazon_Linux_2023_arm64"],
+        reason="LD library failures impact on the docker engine, causes flakiness",
+    )
+    @bug(
+        context.vm_name in ["Ubuntu_24_10_amd64", "Ubuntu_24_10_arm64"] and context.weblog_variant == "test-app-python",
+        reason="INPLAT-478",
+    )
+    @missing_feature(context.vm_os_branch == "windows", reason="Not implemented on Windows")
+    def test_install_after_ld_preload(self):
         """We added entries to the ld.so.preload. After that, we can install the dd software and the app should be instrumented."""
+        virtual_machine = context.scenario.virtual_machine
         logger.info(f"Launching test_install for : [{virtual_machine.name}]...")
         self._test_install(virtual_machine)
         logger.info(f"Done test_install for : [{virtual_machine.name}]")
 
-    @parametrize_virtual_machines(
-        bugs=[
-            {"vm_name": "AlmaLinux_8_arm64", "weblog_variant": "test-app-python-alpine", "reason": "APMON-1576"},
-            {"vm_branch": "amazon_linux2", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            {"vm_branch": "centos_7_amd64", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            {"vm_branch": "redhat", "vm_cpu": "arm64", "weblog_variant": "test-app-ruby", "reason": "INPLAT-103"},
-            # Windows is not supported. Change to missing_feature after merge
-            {"vm_branch": "windows", "reason": "APMON-9999"},
-            {"vm_name": "Ubuntu_24_10_amd64", "weblog_variant": "test-app-python", "reason": "INPLAT-478"},
-            {"vm_name": "Ubuntu_24_10_arm64", "weblog_variant": "test-app-python", "reason": "INPLAT-478"},
-        ]
+    @bug(
+        context.vm_name == "AlmaLinux_8_arm64" and context.weblog_variant == "test-app-python-alpine",
+        reason="APMON-1576",
+    )
+    @bug(
+        context.vm_os_branch == ["centos_7_amd64", "amazon_linux2"] and context.weblog_variant == "test-app-ruby",
+        reason="INPLAT-103",
+    )
+    @bug(
+        context.vm_os_branch == "redhat" and context.vm_os_cpu == "arm64" and context.weblog_variant == "test-app-ruby",
+        reason="INPLAT-103",
+    )
+    @bug(
+        context.vm_name in ["Ubuntu_24_10_amd64", "Ubuntu_24_10_arm64"] and context.weblog_variant == "test-app-python",
+        reason="INPLAT-478",
     )
-    def test_remove_ld_preload(self, virtual_machine):
+    @missing_feature(context.vm_os_branch == "windows", reason="Not implemented on Windows")
+    def test_remove_ld_preload(self):
+        """We added entries to the ld.so.preload. After that, we can remove the entries and the app should be instrumented."""
+        virtual_machine = context.scenario.virtual_machine
         logger.info(f"Launching test_remove_ld_preload for : [{virtual_machine.name}]...")
         self._test_removing_things(virtual_machine, "sudo rm /etc/ld.so.preload")
         logger.info(f"Success test_remove_ld_preload for : [{virtual_machine.name}]")

tests/auto_inject/test_auto_inject_guardrail.py

@@ -1,23 +1,22 @@
-from utils import scenarios, features
+from utils import scenarios, features, context
 from utils.tools import logger
 from utils.onboarding.weblog_interface import make_get_request, warmup_weblog
 from utils.onboarding.wait_for_tcp_port import wait_for_port
-from utils.virtual_machine.utils import parametrize_virtual_machines
 
 
 @features.host_guardrail
 @scenarios.installer_not_supported_auto_injection
 class TestLanguageVersionNotSupported:
     """Test for not supported auto injection. We only check the app is working, although the auto injection is not performed."""
 
-    @parametrize_virtual_machines()
-    def test_app_working(self, virtual_machine):
+    def test_app_working(self):
         """Test app is working."""
+        virtual_machine = context.scenario.virtual_machine
         vm_ip = virtual_machine.get_ip()
         vm_port = virtual_machine.deffault_open_port
         vm_name = virtual_machine.name
         logger.info(f"[{vm_name}] Waiting for weblog available [{vm_ip}:{vm_port}]")
-        wait_for_port(vm_port, vm_ip, 80.0)
+        assert wait_for_port(vm_port, vm_ip, 80.0), "Weblog port not reachable. Is the weblog running?"
         logger.info(f"[{vm_ip}]: Weblog app is ready!")
         warmup_weblog(f"http://{vm_ip}:{vm_port}/")
         logger.info(f"Making a request to weblog [{vm_ip}:{vm_port}]")