From 70fa17bcc4518e21a480aac5f120214b02fe2365 Mon Sep 17 00:00:00 2001 From: Sergii Kipot Date: Thu, 18 Jan 2018 19:01:45 +0100 Subject: [PATCH] TT#29456 Add python-xmlrunner kamailio-config-tests-jessie The package is needed to run tests for old releases Change-Id: I5baca878e8901c7985221c98b98f42c48735faee --- t/Dockerfile | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/t/Dockerfile b/t/Dockerfile index a8a10d86..aa8cd96b 100644 --- a/t/Dockerfile +++ b/t/Dockerfile @@ -1,21 +1,15 @@ -# DOCKER_NAME=kamailio-config-tests-stretch -FROM docker.mgm.sipwise.com/sipwise-stretch:latest +# DOCKER_NAME=kamailio-config-tests-jessie +FROM docker.mgm.sipwise.com/sipwise-jessie:latest # Important! Update this no-op ENV variable when this Dockerfile # 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 # old cached versions when the Dockerfile is built. -ENV REFRESHED_AT 2017-09-20 - -# test execution; we need the backport of python3-junitxml from our own -# repository since it's not part of Debian/stretch -# files that get-code generates -COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/ -COPY t/sources.list.d/preferences /etc/apt/preferences.d/ +ENV REFRESHED_AT 2018-01-18 RUN apt-get update RUN apt-get install --assume-yes python-yaml python-junitxml \ - make libtemplate-perl libyaml-perl + make libtemplate-perl libyaml-perl python-xmlrunner RUN echo './t/testrunner' >>/root/.bash_history @@ -27,16 +21,12 @@ WORKDIR /code/ # When you want to build the base image from scratch # (jump to the next section if you don't want to build yourself!): # -# you need to put the proper NGCP sources at t/sources.list.d/builddeps.list -# for instance, trunk: -# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-stretch main" > t/sources.list.d/builddeps.list -# -# % docker build --tag="kamailio-config-tests-stretch" . -# % docker run --rm -i -t -v $(pwd)/..:/code:rw kamailio-config-tests-stretch:latest bash +# % docker build --tag="kamailio-config-tests-jessie" -f t//Dockerfile . +# % docker run --rm -i -t -v $(pwd):/code:rw kamailio-config-tests-jessie:latest bash # # Use the existing docker image: -# % docker pull docker.mgm.sipwise.com/kamailio-config-tests-stretch -# % docker run --rm -i -t -v $(pwd)/:/code:rw docker.mgm.sipwise.com/kamailio-config-tests-stretch:latest bash +# % docker pull docker.mgm.sipwise.com/kamailio-config-tests-jessie +# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/kamailio-config-tests-jessie:latest bash # # Inside docker (the command is in history, just press UP button): # ./t/testrunner