CI: build on Fedora 33
Also includes update to Netopeer2 which enables custom PID file
Change-Id: I3eb92cc05069ba1a89411f8cc9540a6e1e9c26a7
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/dependencies/+/3254/
Depends-on: https://cesnet-gerrit-public/c/CzechLight/dependencies/+/3254/
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/dependencies/+/3254/
diff --git a/.zuul.public.yaml b/.zuul.public.yaml
index f8a4675..81b220f 100644
--- a/.zuul.public.yaml
+++ b/.zuul.public.yaml
@@ -1,23 +1,23 @@
- job:
- name: f32-gcc-netconf-cli-no-sysrepo
+ name: f33-gcc-netconf-cli-no-sysrepo
description: |
Build a minimal version without sysrepo or the test suite
- parent: f32-gcc
+ parent: f33-gcc
- project:
check:
jobs:
- - f32-gcc-cover:
- requires: CzechLight-deps-f32-gcc
- - f32-clang-asan-ubsan:
- requires: CzechLight-deps-f32-clang-asan-ubsan
- - f32-clang-tsan:
- requires: CzechLight-deps-f32-clang-tsan
- - f32-gcc-netconf-cli-no-sysrepo:
- requires: CzechLight-deps-f32-gcc
- - f32-cpp-coverage-diff:
+ - f33-gcc-cover:
+ requires: CzechLight-deps-f33-gcc
+ - f33-clang-asan-ubsan:
+ requires: CzechLight-deps-f33-clang-asan-ubsan
+ - f33-clang-tsan:
+ requires: CzechLight-deps-f33-clang-tsan
+ - f33-gcc-netconf-cli-no-sysrepo:
+ requires: CzechLight-deps-f33-gcc
+ - f33-cpp-coverage-diff:
voting: false
- clang-format:
voting: false
- - f32-gcc-cover-previous:
- requires: CzechLight-deps-f32-gcc
+ - f33-gcc-cover-previous:
+ requires: CzechLight-deps-f33-gcc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be7f96e..df78b3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,7 +269,7 @@
target_link_libraries(sysreposubscription PUBLIC datastoreaccess PRIVATE PkgConfig::SYSREPO)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test_repositories)
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test_sockets)
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test_netopeer_files)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test_netopeer_outputs)
endif()
@@ -319,7 +319,7 @@
set_property(TEST ${TESTNAME} ${TESTNAME}_init ${TESTNAME}_cleanup APPEND PROPERTY ENVIRONMENT
"SYSREPO_REPOSITORY_PATH=${CMAKE_CURRENT_BINARY_DIR}/test_repositories/${TESTNAME}"
"SYSREPO_SHM_PREFIX=netconf-cli_${TESTNAME}"
- "NETOPEER_SOCKET=${CMAKE_CURRENT_BINARY_DIR}/test_sockets/${TESTNAME}.sock"
+ "NETOPEER_SOCKET=${CMAKE_CURRENT_BINARY_DIR}/test_netopeer_files/${TESTNAME}.sock"
)
endfunction()
@@ -388,7 +388,7 @@
set_property(TEST test_netconf_cli_py test_netconf_cli_py_init test_netconf_cli_py_cleanup APPEND PROPERTY ENVIRONMENT
"SYSREPO_REPOSITORY_PATH=${CMAKE_CURRENT_BINARY_DIR}/test_repositories/test_netconf_cli_py"
"SYSREPO_SHM_PREFIX=netconf-cli_test_netconf_cli_py"
- "NETOPEER_SOCKET=${CMAKE_CURRENT_BINARY_DIR}/test_sockets/test_netconf_cli_py.sock"
+ "NETOPEER_SOCKET=${CMAKE_CURRENT_BINARY_DIR}/test_netopeer_files/test_netconf_cli_py.sock"
)
set(sanitizer_active OFF)
diff --git a/submodules/dependencies b/submodules/dependencies
index ba3de22..174ec68 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit ba3de22763cabe419a03a8a1f75447043d43b1d5
+Subproject commit 174ec68e8f90e13bd2fb3c445fec9ab68bf79c08
diff --git a/tests/init_datastore.bash.in b/tests/init_datastore.bash.in
index 2664a4b..a4ac0df 100755
--- a/tests/init_datastore.bash.in
+++ b/tests/init_datastore.bash.in
@@ -42,8 +42,9 @@
# session and also forks, which means it becomes invisible to ctest. I want the name of the process to be
# recognizable. For that `exec -a` can be used. Unfortunately `exec` is shell-builtin, so I need to run bash instead
# of running `exec` directly. Finally, I redirect its stdout and stderr to a file.
+ NETOPEER_PIDFILE="@CMAKE_CURRENT_BINARY_DIR@/test_netopeer_files/$SYSREPO_SHM_PREFIX.pid"
setsid -f \
- bash -c "exec -a '${SYSREPO_SHM_PREFIX}_netopeer2-server' '$NETOPEER2' -d -v2 '-U$NETOPEER_SOCKET'" \
+ bash -c "exec -a '${SYSREPO_SHM_PREFIX}_netopeer2-server' '$NETOPEER2' -d -v2 '-U$NETOPEER_SOCKET' -p'$NETOPEER_PIDFILE'" \
< /dev/null &> "@CMAKE_CURRENT_BINARY_DIR@/test_netopeer_outputs/$SYSREPO_SHM_PREFIX.out"
sleep 5
fi