Skip to content
Started by timer
Running as SYSTEM
Building remotely on build5-deb12build-ansible (ttcn3 obs osmo-gsm-tester-build qemu io_uring linux-shallow-clone osmocom-gerrit coverity osmocom-master) in workspace /home/osmocom-build/jenkins/workspace/Osmocom_OBS_wireshark
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
 > git init /home/osmocom-build/jenkins/workspace/Osmocom_OBS_wireshark # timeout=10
Fetching upstream changes from https://gerrit.osmocom.org/osmo-ci
 > git --version # timeout=10
 > git --version # 'git version 2.39.5'
 > git fetch --tags --force --progress -- https://gerrit.osmocom.org/osmo-ci +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://gerrit.osmocom.org/osmo-ci # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
Avoid second fetch
 > git rev-parse origin/master^{commit} # timeout=10
Checking out Revision 61e1dc6c03df29103f8610829f3ff2c10d27c18b (origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 61e1dc6c03df29103f8610829f3ff2c10d27c18b # timeout=10
Commit message: "jobs/build-kernels-testenv: use linux-shallow-clone"
 > git rev-list --no-walk 61e1dc6c03df29103f8610829f3ff2c10d27c18b # timeout=10
[Osmocom_OBS_wireshark] $ /bin/sh -xe /tmp/jenkins5690304061064854629.sh
+ export PYTHONUNBUFFERED=1
+ ./scripts/obs/update_obs_wireshark.sh osmocom:wireshark
+ prepare_git_repo
+ cd /home/osmocom-build/jenkins/workspace/Osmocom_OBS_wireshark/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]              lynxis/ipa_osmo_tcap    -> osmocom/lynxis/ipa_osmo_tcap
 * [new branch]              lynxis/rspro            -> osmocom/lynxis/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]              osmocom/qcdiag_20260203 -> osmocom/osmocom/qcdiag_20260203
 * [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 'origin/master'.
+ git merge --no-edit osmocom/osmith/deb-packaging
Auto-merging packaging/debian/control
Auto-merging packaging/debian/rules
Merge made by the 'ort' strategy.
 debian                   |  1 +
 packaging/debian/control |  2 +-
 packaging/debian/rules   | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 120000 debian
+ git merge --no-edit osmocom/osmocom/qcdiag
Auto-merging epan/dissectors/CMakeLists.txt
CONFLICT (content): Merge conflict in epan/dissectors/CMakeLists.txt
Auto-merging epan/dissectors/packet-qcdiag.h
CONFLICT (content): Merge conflict in epan/dissectors/packet-qcdiag.h
Auto-merging epan/dissectors/packet-qcdiag_log.c
CONFLICT (add/add): Merge conflict in epan/dissectors/packet-qcdiag_log.c
Automatic merge failed; fix conflicts and then commit the result.
Build step 'Execute shell' marked build as failure
Sending e-mails to: jenkins-notifications@lists.osmocom.org
Finished: FAILURE