laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42334?usp=email )
Change subject: testenv: do not install/check-for libfftranscode ......................................................................
testenv: do not install/check-for libfftranscode
All testsuites have been migrated to TITAN's own ASN.1 PER codec, so installing libfftranscode is no longer required.
Change-Id: I410deedd1d4671496a8a784690bf630f2bdf6b53 Related: OS#6490 --- M _testenv/data/podman/Dockerfile M _testenv/testenv/requirements.py 2 files changed, 0 insertions(+), 40 deletions(-)
Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index a755b05..a1473df 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -131,16 +131,6 @@ # testsuites inside the docker containers. Don't use it by default. ENV USE_CCACHE=0
-# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER -ENV LIBFFTRANSCODE_VERSION="0.6" -RUN set -x && \ - export DPKG_ARCH="$(dpkg --print-architecture)" && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_$%7BLIBFFTRA... && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_$%7BLIBFF... && \ - dpkg -i ./libfftranscode0_${LIBFFTRANSCODE_VERSION}_${DPKG_ARCH}.deb ./libfftranscode-dev_${LIBFFTRANSCODE_VERSION}_${DPKG_ARCH}.deb && \ - apt-get install --fix-broken && \ - rm libfftranscode*.deb - # Install osmo-python-tests (for obtaining talloc reports from SUT) ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit RUN set -x && \ diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 2e53081..fafec10 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -66,35 +66,5 @@ sys.exit(1)
-def check_fftranscode(): - cmd = [ - "grep", - "-q", - "fftranscode", - os.path.join( - testenv.ttcn3_hacks_dir, - testenv.args.testsuite, - "regen_makefile.sh", - ), - ] - if testenv.cmd.run(cmd, check=False).returncode == 1: - return - - cmd = ["pkg-config", "--modversion", "libfftranscode"] - if testenv.cmd.run(cmd, check=False).returncode == 0: - return - - logging.error("Missing library: libfftranscode") - logging.error( - " https://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Testsu..." - ) - logging.error(" Consider installing it from here:") - logging.error(" https://ftp.osmocom.org/binaries/libfftranscode/") - sys.exit(1) - - def check(): check_programs() - - if not testenv.args.podman: - check_fftranscode()