From 59bd1dea5609b70a656a6f3b82f94493d5241cc8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 11 Jan 2023 12:16:28 +0100 Subject: [PATCH 1/3] update Fedora version 36 Signed-off-by: Steffen Vogel --- packaging/docker/Dockerfile.fedora | 2 +- packaging/live-iso/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index 7a160bb6e..d844bfd60 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -6,7 +6,7 @@ ################################################################################### ARG DISTRO=fedora -ARG FEDORA_VERSION=34 +ARG FEDORA_VERSION=36 ARG REF=unknown FROM ${DISTRO}:${FEDORA_VERSION} AS dev diff --git a/packaging/live-iso/Dockerfile b/packaging/live-iso/Dockerfile index 4f08af11d..43af5f7ed 100644 --- a/packaging/live-iso/Dockerfile +++ b/packaging/live-iso/Dockerfile @@ -5,7 +5,7 @@ # @license Apache 2.0 ################################################################################### -FROM fedora:35 +FROM fedora:36 RUN dnf -y install \ git \ From 8464975447bcea2cd4817440567970f9439d795a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 11 Jan 2023 12:51:48 +0100 Subject: [PATCH 2/3] ci: remove libsegfault usage as its gone in newer glibc versions Signed-off-by: Steffen Vogel --- .gitlab-ci.yml | 3 --- tests/integration/CMakeLists.txt | 3 --- tests/unit/CMakeLists.txt | 3 --- 3 files changed, 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95e02019a..b3c391d39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,9 +126,6 @@ test:cppcheck: test:unit: stage: test image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} - variables: - LD_PRELOAD: /usr/lib64/libSegFault.so - SEGFAULT_SIGNALS: all script: - mkdir -p build && cd build - cmake ${CMAKE_OPTS} .. diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 6d96c04e9..35577c01a 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -10,9 +10,6 @@ add_custom_target(run-integration-tests /bin/bash -o pipefail -c \" SRCDIR=${PROJECT_SOURCE_DIR} BUILDDIR=${PROJECT_BINARY_DIR} - LD_PRELOAD=/usr/lib64/libSegFault.so - SEGFAULT_SIGNALS=all - SEGFAULT_SIGNALS='bus abrt' ${PROJECT_SOURCE_DIR}/tools/integration-tests.sh 2>&1 | c++filt\" USES_TERMINAL DEPENDS diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 569349e9d..3797af484 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -30,9 +30,6 @@ target_link_libraries(unit-tests PUBLIC add_custom_target(run-unit-tests COMMAND /bin/bash -o pipefail -c \" - LD_PRELOAD=/usr/lib64/libSegFault.so - SEGFAULT_SIGNALS=all - SEGFAULT_SIGNALS='bus abrt' $ 2>&1 | c++filt\" DEPENDS unit-tests From 308fa431fd20f51a362e1791e9bc017db6cd97e8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 11 Jan 2023 12:58:13 +0100 Subject: [PATCH 3/3] add missing package for iproute2 TC Signed-off-by: Steffen Vogel --- lib/kernel/tc_netem.cpp | 2 +- packaging/docker/Dockerfile.fedora | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kernel/tc_netem.cpp b/lib/kernel/tc_netem.cpp index 1c1e92d57..eeb59c0d1 100644 --- a/lib/kernel/tc_netem.cpp +++ b/lib/kernel/tc_netem.cpp @@ -116,7 +116,7 @@ int villas::kernel::tc::netem_parse(struct rtnl_qdisc **netem, json_t *json) if (json_delay_distribution) { if (set_delay_distribution(ne, json_delay_distribution)) - throw ConfigError(json_delay_distribution, "Invalid delay distribution in netem config"); + throw ConfigError(json_delay_distribution, "node-config-netem-distrobution", "Invalid delay distribution in netem config"); } if (json_delay_correlation) { diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index d844bfd60..03c15f742 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -28,7 +28,7 @@ RUN dnf -y install \ openssh-clients \ rpmdevtools rpm-build \ jq nmap-ncat \ - iproute \ + iproute iproute-tc \ python-pip \ valgrind gdb gdb-gdbserver \ cppcheck \