Skip to content

Commit 859b0e4

Browse files
authored
ROX-31971: Use latest version of clang (#2690) (#2699)
1 parent 3a72be1 commit 859b0e4

File tree

6 files changed

+21
-6
lines changed

6 files changed

+21
-6
lines changed

builder/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN dnf -y update \
1111
binutils-devel \
1212
bison \
1313
ca-certificates \
14-
'clang-19.1.*' \
15-
'llvm-19.1.*' \
14+
clang \
15+
llvm \
1616
cmake \
1717
cracklib-dicts \
1818
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.3
1+
3.21-1

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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/stackrox/collector/integration-tests/pkg/collector"
1010
"github.com/stackrox/collector/integration-tests/pkg/common"
1111
"github.com/stackrox/collector/integration-tests/pkg/config"
12+
"github.com/stackrox/collector/integration-tests/pkg/log"
1213
"github.com/stackrox/collector/integration-tests/pkg/types"
1314
"github.com/stackrox/collector/integration-tests/suites"
1415
)
@@ -528,9 +529,23 @@ func TestRingBuffer(t *testing.T) {
528529
}
529530

530531
func TestUdpNetworkFlow(t *testing.T) {
532+
log.Info("VMInfo: %s", config.VMInfo)
531533
if strings.Contains(config.VMInfo().Config, "rhel-8-4-sap") {
532534
t.Skip("Skipping test on RHEL 8.4 SAP due to a verifier issue")
533535
}
536+
skipped_vms := []string{
537+
"rhcos",
538+
"rhel_rhel-8",
539+
"rhel-sap",
540+
"rhel-s390x",
541+
"rhel-88", // ppc64le
542+
}
543+
for _, vm := range skipped_vms {
544+
if strings.Contains(config.VMInfo().Config, vm) {
545+
t.Skip("Skipping due to ROX-27673")
546+
}
547+
}
548+
534549
suite.Run(t, new(suites.UdpNetworkFlow))
535550
}
536551

0 commit comments

Comments
 (0)