Build failed in Jenkins: Osmocom_OBS_wireshark #648

See <https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/648/display/redirect?page=changes> Changes: [Oliver Smith] jobs/ttcn3-ns-test{,-sns}: tweak timer [laforge] jobs/osmocom-release-android-apks: new job ------------------------------------------ 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 89a3b3f049c13c8d7e3ba17e305990fc9ea21f3d (origin/master) Commit message: "jobs/osmocom-release-android-apks: new job" [Osmocom_OBS_wireshark] $ /bin/sh -xe /tmp/jenkins11164201571450792949.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'... Updating files: 59% (4104/6906)Updating files: 60% (4144/6906)Updating files: 61% (4213/6906)Updating files: 62% (4282/6906)Updating files: 63% (4351/6906)Updating files: 64% (4420/6906)Updating files: 65% (4489/6906)Updating files: 66% (4558/6906)Updating files: 67% (4628/6906)Updating files: 68% (4697/6906)Updating files: 69% (4766/6906)Updating files: 70% (4835/6906)Updating files: 71% (4904/6906)Updating files: 72% (4973/6906)Updating files: 73% (5042/6906)Updating files: 74% (5111/6906)Updating files: 75% (5180/6906)Updating files: 76% (5249/6906)Updating files: 77% (5318/6906)Updating files: 78% (5387/6906)Updating files: 79% (5456/6906)Updating files: 80% (5525/6906)Updating files: 81% (5594/6906)Updating files: 82% (5663/6906)Updating files: 83% (5732/6906)Updating files: 84% (5802/6906)Updating files: 85% (5871/6906)Updating files: 86% (5940/6906)Updating files: 87% (6009/6906)Updating files: 88% (6078/6906)Updating files: 89% (6147/6906)Updating files: 90% (6216/6906)Updating files: 91% (6285/6906)Updating files: 92% (6354/6906)Updating files: 93% (6423/6906)Updating files: 94% (6492/6906)Updating files: 95% (6561/6906)Updating files: 96% (6630/6906)Updating files: 97% (6699/6906)Updating files: 98% (6768/6906)Updating files: 99% (6837/6906)Updating files: 100% (6906/6906)Updating files: 100% (6906/6906), done. + 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/csn1 -> osmocom/pespin/csn1 * [new branch] pespin/gsup -> osmocom/pespin/gsup * [new branch] pespin/iuup-extended -> osmocom/pespin/iuup-extended * [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 Auto-merging wsutil/CMakeLists.txt CONFLICT (content): Merge conflict in wsutil/CMakeLists.txt Auto-merging packaging/debian/rules Auto-merging packaging/debian/control Automatic merge failed; fix conflicts and then commit the result. Build step 'Execute shell' marked build as failure