From 0067b7a6d2397056e15f0c8881318b6fda6d4f1e Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Wed, 5 Mar 2025 13:59:16 +0100 Subject: [PATCH 1/2] [CWS] add kmt test run with just `TestEventMonitor` --- .../kernel_matrix_testing/security_agent.yml | 85 ++++++++++++++++++- .../test-runner/files/cws_peds.json | 9 ++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 test/new-e2e/system-probe/test-runner/files/cws_peds.json diff --git a/.gitlab/kernel_matrix_testing/security_agent.yml b/.gitlab/kernel_matrix_testing/security_agent.yml index 769ebe10138b85..62f0e279aa6970 100644 --- a/.gitlab/kernel_matrix_testing/security_agent.yml +++ b/.gitlab/kernel_matrix_testing/security_agent.yml @@ -114,6 +114,10 @@ upload_secagent_tests_arm64: extends: .kmt_run_secagent_tests_base allow_failure: true +.kmt_run_secagent_tests_required: + extends: .kmt_run_secagent_tests_base + allow_failure: false + kmt_run_secagent_tests_x64: extends: - .kmt_run_secagent_tests @@ -156,9 +160,51 @@ kmt_run_secagent_tests_x64: - !reference [.collect_outcomes_kmt] - !reference [.upload_junit_kmt] +kmt_run_secagent_tests_x64_peds: + extends: + - .kmt_run_secagent_tests_required + image: registry.ddbuild.io/ci/datadog-agent-buildimages/system-probe_x64$DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_SYSPROBE_BUILDIMAGES + tags: ["arch:amd64"] + needs: + - kmt_setup_env_secagent_x64 + - upload_dependencies_secagent_x64 + - upload_secagent_tests_x64 + variables: + ARCH: "x86_64" + parallel: + matrix: + - TAG: + - "ubuntu_18.04" + - "ubuntu_20.04" + - "ubuntu_22.04" + - "ubuntu_24.04" + - "ubuntu_24.10" + - "amazon_4.14" + - "amazon_5.4" + - "amazon_5.10" + - "amazon_2023" + - "fedora_37" + - "fedora_38" + - "debian_10" + - "debian_11" + - "debian_12" + - "centos_7.9" + - "oracle_8.9" + - "oracle_9.3" + - "rocky_8.5" + - "rocky_9.3" + - "rocky_9.4" + - "opensuse_15.3" + - "opensuse_15.5" + - "suse_12.5" + TEST_SET: [cws_peds] + after_script: + - !reference [.collect_outcomes_kmt] + - !reference [.upload_junit_kmt] + kmt_run_secagent_tests_x64_required: extends: - - .kmt_run_secagent_tests_base + - .kmt_run_secagent_tests_required image: registry.ddbuild.io/ci/datadog-agent-buildimages/system-probe_x64$DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_SYSPROBE_BUILDIMAGES tags: ["arch:amd64"] needs: @@ -290,6 +336,41 @@ kmt_run_secagent_tests_arm64: - !reference [.collect_outcomes_kmt] - !reference [.upload_junit_kmt] +kmt_run_secagent_tests_arm64_peds: + extends: + - .kmt_run_secagent_tests_required + image: registry.ddbuild.io/ci/datadog-agent-buildimages/system-probe_arm64$DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_SYSPROBE_BUILDIMAGES + tags: ["arch:arm64"] + needs: + - kmt_setup_env_secagent_arm64 + - upload_dependencies_secagent_arm64 + - upload_secagent_tests_arm64 + variables: + ARCH: "arm64" + parallel: + matrix: + - TAG: + - "ubuntu_22.04" + - "ubuntu_24.04" + - "ubuntu_24.10" + - "amazon_5.4" + - "amazon_5.10" + - "amazon_2023" + - "fedora_37" + - "fedora_38" + - "debian_11" + - "debian_12" + - "oracle_8.9" + - "oracle_9.3" + - "rocky_8.5" + - "rocky_9.3" + - "rocky_9.4" + - "opensuse_15.5" + TEST_SET: [cws_peds] + after_script: + - !reference [.collect_outcomes_kmt] + - !reference [.upload_junit_kmt] + kmt_run_secagent_tests_arm64_ad: extends: - .kmt_run_secagent_tests @@ -384,6 +465,7 @@ kmt_secagent_tests_join_arm64: - .kmt_secagent_tests_join needs: - kmt_run_secagent_tests_arm64 + - kmt_run_secagent_tests_arm64_peds - kmt_run_secagent_tests_arm64_ad - kmt_run_secagent_tests_arm64_ebpfless - kmt_run_secagent_tests_arm64_docker @@ -405,6 +487,7 @@ kmt_secagent_tests_join_x64: - .kmt_secagent_tests_join needs: - kmt_run_secagent_tests_x64 + - kmt_run_secagent_tests_x64_peds - kmt_run_secagent_tests_x64_required - kmt_run_secagent_tests_x64_ad - kmt_run_secagent_tests_x64_ebpfless diff --git a/test/new-e2e/system-probe/test-runner/files/cws_peds.json b/test/new-e2e/system-probe/test-runner/files/cws_peds.json new file mode 100644 index 00000000000000..77b73ddad275e7 --- /dev/null +++ b/test/new-e2e/system-probe/test-runner/files/cws_peds.json @@ -0,0 +1,9 @@ +{ + "filters": { + "pkg/security": { + "run-only": [ + "TestEventMonitor" + ] + } + } +} From 0f7a506c93806b3d7288725f161a1af761fcaf7e Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Wed, 5 Mar 2025 14:02:02 +0100 Subject: [PATCH 2/2] fix join --- .gitlab/kernel_matrix_testing/security_agent.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab/kernel_matrix_testing/security_agent.yml b/.gitlab/kernel_matrix_testing/security_agent.yml index 62f0e279aa6970..17ff3fecb4c44c 100644 --- a/.gitlab/kernel_matrix_testing/security_agent.yml +++ b/.gitlab/kernel_matrix_testing/security_agent.yml @@ -482,24 +482,30 @@ kmt_secagent_cleanup_arm64: ARCH: arm64 INSTANCE_TYPE: "m6gd.metal" -kmt_secagent_tests_join_x64: +kmt_secagent_tests_join1_x64: extends: - .kmt_secagent_tests_join needs: - kmt_run_secagent_tests_x64 - - kmt_run_secagent_tests_x64_peds - - kmt_run_secagent_tests_x64_required - kmt_run_secagent_tests_x64_ad - kmt_run_secagent_tests_x64_ebpfless - kmt_run_secagent_tests_x64_docker +kmt_secagent_tests_join2_x64: + extends: + - .kmt_secagent_tests_join + needs: + - kmt_run_secagent_tests_x64_peds + - kmt_run_secagent_tests_x64_required + kmt_secagent_cleanup_x64: when: always extends: - .kmt_secagent_cleanup needs: - kmt_setup_env_secagent_x64 - - kmt_secagent_tests_join_x64 + - kmt_secagent_tests_join1_x64 + - kmt_secagent_tests_join2_x64 - upload_dependencies_secagent_x64 - upload_secagent_tests_x64 variables: