MT#57453 Switch docker image to bookworm

run_tests.sh: don't use arguments to define output filename

We are getting errors in the new version of lua-unit
> lua5.1: /usr/share/lua/5.1/luaunit.lua:2205: With Junit, an output filename must be supplied with --name!

Change-Id: I0ebd585907f00c3e02f3cf794239c328b0ab202d
mr12.1.1
Mykola Malkov 2 years ago committed by Victor Seva
parent c0a8cfef88
commit 8f553ad979

@ -38,11 +38,11 @@ lu.LuaUnit:setOutputType('${FORMAT}')
lu.LuaUnit:run() lu.LuaUnit:run()
EOF EOF
else else
cat<<EOF |lua5.1 - --name "${RES}" cat<<EOF |lua5.1 -
local lu = require('luaunit') local lu = require('luaunit')
require "tests/${1}" require "tests/${1}"
---- Control test output: ---- Control test output:
lu.LuaUnit:setOutputType('${FORMAT}') lu.LuaUnit:setOutputType('${FORMAT}', '${RES}')
lu.LuaUnit:run() lu.LuaUnit:run()
EOF EOF
if [[ "${FORMAT}" = "JUNIT" ]] ; then if [[ "${FORMAT}" = "JUNIT" ]] ; then
@ -51,7 +51,6 @@ EOF
fi fi
} }
if [[ -n "$@" ]]; then if [[ -n "$@" ]]; then
for i in "$@"; do for i in "$@"; do
if [ ! -f "$i" ]; then if [ ! -f "$i" ]; then

@ -1,11 +1,11 @@
# DOCKER_NAME=lua-ngcp-kamailio-bullseye # DOCKER_NAME=lua-ngcp-kamailio-bookworm
FROM docker.mgm.sipwise.com/sipwise-bullseye:latest FROM docker.mgm.sipwise.com/sipwise-bookworm:latest
# Important! Update this no-op ENV variable when this Dockerfile # Important! Update this no-op ENV variable when this Dockerfile
# is updated with the current date. It will force refresh of all # is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using # of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built. # old cached versions when the Dockerfile is built.
ENV REFRESHED_AT 2021-05-03 ENV REFRESHED_AT 2023-06-26
# files that get-code generates # files that get-code generates
COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/ COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/
@ -28,15 +28,15 @@ WORKDIR /code/
# #
# you need to put the proper NGCP sources at t/sources.list.d/builddeps.list # you need to put the proper NGCP sources at t/sources.list.d/builddeps.list
# for instance, trunk: # for instance, trunk:
# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-bullseye main" > t/sources.list.d/builddeps.list # echo "deb https://deb.sipwise.com/autobuild/ release-trunk-bookworm main" > t/sources.list.d/builddeps.list
# #
# % docker build --tag="lua-ngcp-kamailio-bullseye" -f t/Dockerfile . # % docker build --tag="lua-ngcp-kamailio-bookworm" -f t/Dockerfile .
# % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-bullseye:latest bash # % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-bookworm:latest bash
# #
# Use the existing docker image: # Use the existing docker image:
# % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-bullseye # % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-bookworm
# NOTE: run the following command from root folder of git repository: # NOTE: run the following command from root folder of git repository:
# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-bullseye:latest bash # % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-bookworm:latest bash
# #
# Inside docker (the command is in history, just press UP button): # Inside docker (the command is in history, just press UP button):
# ./t/testrunner # ./t/testrunner

Loading…
Cancel
Save