See <https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/408/display/redirect> Changes: ------------------------------------------ Started by timer Running as SYSTEM Building remotely on build2-deb11build-ansible (ttcn3 obs osmocom-gerrit coverity osmocom-master) in workspace <https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/ws/> The recommended git tool is: NONE No credentials specified Wiping out workspace first. Cloning the remote Git repository Cloning repository https://gerrit.osmocom.org/osmo-ci Fetching upstream changes from https://gerrit.osmocom.org/osmo-ci Avoid second fetch Checking out Revision a307c7df718af05d978a65cd96a51138fb1b4d31 (origin/master) Commit message: "jobs/gerrit,master: osmo-hnbgw: add nftables var" [Osmocom_OBS_wireshark] $ /bin/sh -xe /tmp/jenkins11358089016027904439.sh + export PYTHONUNBUFFERED=1 + ./scripts/obs/update_obs_wireshark.sh osmocom:wireshark + prepare_git_repo + cd <https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/ws/scripts/obs> + [ -d _cache/wireshark ] + mkdir -p _cache + git -C _cache clone https://gitlab.com/wireshark/wireshark.git Cloning into 'wireshark'... + git -C _cache/wireshark remote add osmocom https://gitea.osmocom.org/osmocom/wireshark + cd _cache/wireshark + git fetch --all Fetching origin Fetching osmocom From https://gitea.osmocom.org/osmocom/wireshark * [new branch] daniel/osmux -> osmocom/daniel/osmux * [new branch] fixeria/ipa -> osmocom/fixeria/ipa * [new branch] laforge/amr-2023 -> osmocom/laforge/amr-2023 * [new branch] laforge/doc-fixes -> osmocom/laforge/doc-fixes * [new branch] laforge/pending -> osmocom/laforge/pending * [new branch] laforge/qcdiag -> osmocom/laforge/qcdiag * [new branch] laforge/rspro -> osmocom/laforge/rspro * [new branch] master -> osmocom/master * [new branch] mobis -> osmocom/mobis * [new branch] mobis_new -> osmocom/mobis_new * [new branch] more-patches -> osmocom/more-patches * [new branch] osmith/deb-packaging -> osmocom/osmith/deb-packaging * [new branch] osmith/wip -> osmocom/osmith/wip * [new branch] osmocom/master -> osmocom/osmocom/master * [new branch] osmocom/qcdiag -> osmocom/osmocom/qcdiag * [new branch] pespin/amr -> osmocom/pespin/amr * [new branch] pespin/csn1 -> osmocom/pespin/csn1 * [new branch] pespin/gsup -> osmocom/pespin/gsup * [new branch] pespin/osmux-stats -> osmocom/pespin/osmux-stats * [new branch] pespin/osmux-wip -> osmocom/pespin/osmux-wip * [new branch] pespin/racap -> osmocom/pespin/racap * [new branch] pespin/racap-tmp -> osmocom/pespin/racap-tmp * [new branch] pespin/rlcmac -> osmocom/pespin/rlcmac * [new branch] sylvain/gmr -> osmocom/sylvain/gmr * [new branch] sylvain/gmr1 -> osmocom/sylvain/gmr1 * [new branch] thomas/dect -> osmocom/thomas/dect + git clean -fdx + git checkout -f -B osmocom/all-in-one origin/master Switched to a new branch 'osmocom/all-in-one' Branch 'osmocom/all-in-one' set up to track remote branch 'master' from 'origin'. + git merge --no-edit osmocom/osmith/deb-packaging Merge made by the 'recursive' strategy. debian | 1 + packaging/debian/control | 3 ++- packaging/debian/rules | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 debian + git merge --no-edit osmocom/osmocom/qcdiag Auto-merging epan/dissectors/packet-gsm_rlcmac.c CONFLICT (content): Merge conflict in epan/dissectors/packet-gsm_rlcmac.c Auto-merging epan/dissectors/CMakeLists.txt Automatic merge failed; fix conflicts and then commit the result. Build step 'Execute shell' marked build as failure