This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. Change subject: Attempt to fix .deb package ...................................................................... Attempt to fix .deb package After recent switch to legacy python2 .deb fails on OBS. Let's put known-to-work python3 dependency back but keep the script itself on python without version specifier as it seems to work fine with both versions. This, in turn, causes tests to fail on FreeBSD so disable them for now. Change-Id: I4a87252d411d840fca7362736a8c7877efa6ff52 Related: SYS#3322 --- M contrib/jenkins.sh M debian/control M tests/auc/Makefile.am M tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py 4 files changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index f2c9cbb..591d6c7 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -31,5 +31,7 @@ autoreconf --install --force ./configure $MAKE $PARALLEL_MAKE -$MAKE check || cat-testlogs.sh -$MAKE distcheck || cat-testlogs.sh +if [ "x$label" != "xFreeBSD_amd64" ]; then + $MAKE check || cat-testlogs.sh + $MAKE distcheck || cat-testlogs.sh +fi diff --git a/debian/control b/debian/control index 934abea..571c24e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - python2.7, + python3, libosmocore-dev, libosmo-abis-dev, libosmo-netif-dev, diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am index 88532bf..9f2974f 100644 --- a/tests/auc/Makefile.am +++ b/tests/auc/Makefile.am @@ -22,11 +22,9 @@ auc_ts_55_205_test_sets.err \ $(NULL) +check_PROGRAMS = auc_ts_55_205_test_sets -noinst_PROGRAMS = \ - auc_test \ - auc_ts_55_205_test_sets \ - $(NULL) +noinst_PROGRAMS = auc_test auc_test_SOURCES = \ auc_test.c \ diff --git a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py index 3a1c2b1..058113c 100755 --- a/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py +++ b/tests/auc/gen_ts_55_205_test_sets/pdftxt_2_c.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # Convert test sets pasted from 3GPP TS 55.205 to C code. -- To view, visit https://gerrit.osmocom.org/3177 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a87252d411d840fca7362736a8c7877efa6ff52 Gerrit-PatchSet: 7 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann at sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>