From 95b87585afd54d37963285b42b0f22d05e9d4db9 Mon Sep 17 00:00:00 2001 From: Olivier Valentin Date: Tue, 2 Dec 2025 19:27:30 +0100 Subject: [PATCH] ROX-31971: Use latest version of clang (#2690) * Use latest version of clang * Fix falco for verifier errors induced by the newer clang * Disable UDP testing on most RHEL kernels (for which we don't have a fix yet) Co-authored-by: Mauro Ezequiel Moltrasio --- builder/Dockerfile | 4 ++-- falcosecurity-libs | 2 +- integration-tests/container/QA_TAG | 2 +- integration-tests/container/udp/udp-client.c | 2 +- integration-tests/container/udp/udp-server.c | 2 +- integration-tests/integration_test.go | 18 +++++++++++++++--- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/builder/Dockerfile b/builder/Dockerfile index 88e25dfd66..4a200957e5 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -12,8 +12,8 @@ RUN dnf -y update \ binutils-devel \ bison \ ca-certificates \ - 'clang-19.1.*' \ - 'llvm-19.1.*' \ + clang \ + llvm \ cmake \ cracklib-dicts \ diffutils \ diff --git a/falcosecurity-libs b/falcosecurity-libs index cc9f340f2f..af2b6161c6 160000 --- a/falcosecurity-libs +++ b/falcosecurity-libs @@ -1 +1 @@ -Subproject commit cc9f340f2f45c07e08b26e1d75e0a3313851c803 +Subproject commit af2b6161c6060ff47b843d9ff129b9de2ed03a35 diff --git a/integration-tests/container/QA_TAG b/integration-tests/container/QA_TAG index 50ffc5aa7f..0add3b1ae1 100644 --- a/integration-tests/container/QA_TAG +++ b/integration-tests/container/QA_TAG @@ -1 +1 @@ -2.0.3 +3.23-1 diff --git a/integration-tests/container/udp/udp-client.c b/integration-tests/container/udp/udp-client.c index 496b646c3a..59e6dc5341 100644 --- a/integration-tests/container/udp/udp-client.c +++ b/integration-tests/container/udp/udp-client.c @@ -22,7 +22,7 @@ static const char LOREM_IPSUM[] = "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. " "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n"; static const int LOREM_IPSUM_LEN = sizeof(LOREM_IPSUM) / sizeof(char); -static const size_t IOVEC_N = 32; +static const size_t IOVEC_N = 16; static const size_t MMSGHDR_N = 32; typedef enum send_method_e { diff --git a/integration-tests/container/udp/udp-server.c b/integration-tests/container/udp/udp-server.c index 11fffff2b3..2644c2492d 100644 --- a/integration-tests/container/udp/udp-server.c +++ b/integration-tests/container/udp/udp-server.c @@ -15,7 +15,7 @@ #include static const size_t BUF_SIZE = 4096; -static const size_t IOVEC_N = 32; +static const size_t IOVEC_N = 16; static const size_t MMSGHDR_N = 32; static bool running = true; diff --git a/integration-tests/integration_test.go b/integration-tests/integration_test.go index 82a5d2118d..66f79ac84d 100644 --- a/integration-tests/integration_test.go +++ b/integration-tests/integration_test.go @@ -13,6 +13,7 @@ import ( "github.com/stackrox/collector/integration-tests/pkg/collector" "github.com/stackrox/collector/integration-tests/pkg/common" "github.com/stackrox/collector/integration-tests/pkg/config" + "github.com/stackrox/collector/integration-tests/pkg/log" "github.com/stackrox/collector/integration-tests/pkg/types" "github.com/stackrox/collector/integration-tests/suites" ) @@ -561,12 +562,23 @@ func TestRingBuffer(t *testing.T) { } func TestUdpNetworkFlow(t *testing.T) { - if strings.Contains(config.VMInfo().Config, "rhel-8-4-sap") { - t.Skip("Skipping test on RHEL 8.4 SAP due to a verifier issue") - } + log.Info("VMInfo: %s", config.VMInfo) if strings.Contains(config.VMInfo().Config, "fedora-coreos-stable") { t.Skip("Skipping due to ROX-27673") } + skipped_vms := []string{ + "rhcos", + "rhel_rhel-8", + "rhel-sap", + "rhel-s390x", + "rhel-88", // ppc64le + } + for _, vm := range skipped_vms { + if strings.Contains(config.VMInfo().Config, vm) { + t.Skip("Skipping due to ROX-27673") + } + } + suite.Run(t, new(suites.UdpNetworkFlow)) }