Skip to content

Commit d97c0e5

Browse files
ovalentiMolter73
andauthored
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 <[email protected]>
1 parent f1c47ed commit d97c0e5

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ RUN dnf -y update \
1212
binutils-devel \
1313
bison \
1414
ca-certificates \
15-
'clang-19.1.*' \
16-
'llvm-19.1.*' \
15+
clang \
16+
llvm \
1717
cmake \
1818
cracklib-dicts \
1919
diffutils \

integration-tests/container/QA_TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.4
1+
2.0.5

integration-tests/container/udp/udp-client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static const char LOREM_IPSUM[] =
2222
"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "
2323
"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n";
2424
static const int LOREM_IPSUM_LEN = sizeof(LOREM_IPSUM) / sizeof(char);
25-
static const size_t IOVEC_N = 32;
25+
static const size_t IOVEC_N = 16;
2626
static const size_t MMSGHDR_N = 32;
2727

2828
typedef enum send_method_e {

integration-tests/container/udp/udp-server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <sys/types.h>
1616

1717
static const size_t BUF_SIZE = 4096;
18-
static const size_t IOVEC_N = 32;
18+
static const size_t IOVEC_N = 16;
1919
static const size_t MMSGHDR_N = 32;
2020
static bool running = true;
2121

integration-tests/integration_test.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/stackrox/collector/integration-tests/pkg/collector"
1414
"github.com/stackrox/collector/integration-tests/pkg/common"
1515
"github.com/stackrox/collector/integration-tests/pkg/config"
16+
"github.com/stackrox/collector/integration-tests/pkg/log"
1617
"github.com/stackrox/collector/integration-tests/pkg/types"
1718
"github.com/stackrox/collector/integration-tests/suites"
1819
)
@@ -576,12 +577,23 @@ func TestRingBuffer(t *testing.T) {
576577
}
577578

578579
func TestUdpNetworkFlow(t *testing.T) {
579-
if strings.Contains(config.VMInfo().Config, "rhel-8-4-sap") {
580-
t.Skip("Skipping test on RHEL 8.4 SAP due to a verifier issue")
581-
}
580+
log.Info("VMInfo: %s", config.VMInfo)
582581
if strings.Contains(config.VMInfo().Config, "fedora-coreos-stable") {
583582
t.Skip("Skipping due to ROX-27673")
584583
}
584+
skipped_vms := []string{
585+
"rhcos",
586+
"rhel_rhel-8",
587+
"rhel-sap",
588+
"rhel-s390x",
589+
"rhel-88", // ppc64le
590+
}
591+
for _, vm := range skipped_vms {
592+
if strings.Contains(config.VMInfo().Config, vm) {
593+
t.Skip("Skipping due to ROX-27673")
594+
}
595+
}
596+
585597
suite.Run(t, new(suites.UdpNetworkFlow))
586598
}
587599

0 commit comments

Comments
 (0)