aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-01-12 14:55:32 +0100
committerHarald Welte <laforge@gnumonks.org>2018-01-12 16:52:25 +0000
commit577f2a95e4f01c58a0a4f4ccb3b70d9c048b626e (patch)
tree05fce6d9b48936a32b57ccce3e72a94228d2fac9 /docker
parentfbcc11b4736d3b8d9ebda5eb27fa36067d1d6baf (diff)
docker osmo jenkins: osmo-py-tests: use contrib/jenkins.sh to install
No need to duplicate the install steps we have in osmo-python-tests/contrib now. Also runs the tests. Change-Id: Ibb8eb04e3a5c9c5dcc9b99c83425d2604378f960
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile_osmocom_jenkins.amd642
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index 063199b..45f722f 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -41,4 +41,4 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client
ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit
-RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && python2 ./setup.py install && python3 ./setup.py install
+RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh