From bb00f37f51cf36c6fb4bd3bd6ac68b98bb048841 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 13 May 2019 09:06:35 +0200 Subject: gitlab-ci: run setcap on dumpcap. This enables capture privileges for 'user' that is used in the tests. travis.yml has been changed as well to reflect the setcap command in the docs. Change-Id: I0584e0df417112b1774b86ef8b28121799efe137 Reviewed-on: https://code.wireshark.org/review/33182 Reviewed-by: Peter Wu --- .gitlab-ci.yml | 1 + .travis.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7c8c4924e..229be5efe4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ - ninja - ninja test-programs - chown -R user . + - if [ -f run/dumpcap ]; then setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi - su user -c pytest-3 .build-rpm: &build-rpm diff --git a/.travis.yml b/.travis.yml index 6a8898d07d..3574cf0ff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,7 +120,7 @@ script: - cmake --build . --config RelWithDebInfo - cmake --build . --config RelWithDebInfo --target test-programs - if [ "$PCAP" = "OFF" ]; then export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark; fi - - if [ "$TRAVIS_OS_NAME" == "linux" -a "$PCAP" = "ON" ]; then sudo setcap "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" run/dumpcap; fi + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$PCAP" = "ON" ]; then sudo setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi - pytest - cd .. before_cache: -- cgit v1.2.3