aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md34
-rw-r--r--arm-none-eabi-gcc-4.8.2/Dockerfile6
-rw-r--r--centos8-build/Dockerfile14
-rw-r--r--centos8-obs-latest/Dockerfile17
-rw-r--r--debian-buster-erlang/Dockerfile3
-rw-r--r--debian-buster-jenkins/Dockerfile3
-rw-r--r--debian-buster-simtrace2/Dockerfile3
-rw-r--r--debian-jessie-osmocom/Dockerfile3
-rw-r--r--debian-stretch-build/Dockerfile3
-rw-r--r--debian-stretch-jenkins/Dockerfile3
-rw-r--r--debian-stretch-obs-latest/Dockerfile3
-rw-r--r--debian-stretch-titan/Dockerfile4
-rw-r--r--debian10-obs-submit/Dockerfile26
-rw-r--r--debian10-obs-submit/Makefile1
-rw-r--r--jenkins-common.sh25
-rw-r--r--make/Makefile21
-rw-r--r--nplab-m3ua-test/osmo-stp.cfg2
-rw-r--r--nplab-sua-test/osmo-stp.cfg2
-rw-r--r--osmo-bsc-latest/Dockerfile3
-rw-r--r--osmo-bts-latest/Dockerfile3
-rw-r--r--osmo-bts-latest/osmo-bts.cfg1
-rw-r--r--osmo-bts-master/osmo-bts.cfg1
-rw-r--r--osmo-cbc-latest/Dockerfile3
-rw-r--r--osmo-cn-latest/Dockerfile3
-rw-r--r--osmo-cn-latest/osmo-mgw.cfg3
-rw-r--r--osmo-cn-latest/osmo-msc.cfg2
-rw-r--r--osmo-cn-latest/osmo-msc.cfg.base2
-rw-r--r--osmo-cn-latest/osmo-sgsn.cfg2
-rw-r--r--osmo-cn-latest/osmo-stp.cfg1
-rw-r--r--osmo-gbproxy-latest/Dockerfile3
-rw-r--r--osmo-ggsn-latest/Dockerfile3
-rw-r--r--osmo-hlr-latest/Dockerfile3
-rw-r--r--osmo-hnbgw-latest/Dockerfile3
-rw-r--r--osmo-mgw-latest/Dockerfile3
-rw-r--r--osmo-mgw-latest/osmo-mgw.cfg3
-rw-r--r--osmo-mgw-master/osmo-mgw.cfg1
-rw-r--r--osmo-msc-latest/Dockerfile3
-rw-r--r--osmo-nitb-latest/Dockerfile3
-rw-r--r--osmo-nitb-latest/openbsc.cfg1
-rw-r--r--osmo-nitb-master/openbsc.cfg1
-rw-r--r--osmo-pcap-latest/Dockerfile29
-rw-r--r--osmo-pcap-latest/Makefile1
-rw-r--r--osmo-pcap-latest/osmo-pcap-client.cfg14
-rw-r--r--osmo-pcap-master/Dockerfile51
-rw-r--r--osmo-pcap-master/Makefile1
-rw-r--r--osmo-pcap-master/osmo-pcap-client.cfg14
-rw-r--r--osmo-pcu-latest/Dockerfile3
-rw-r--r--osmo-ran/Dockerfile15
-rw-r--r--osmo-ran/split/ran-bsc_mgw/Dockerfile15
-rw-r--r--osmo-ran/split/ran-bts_pcu/Dockerfile15
-rw-r--r--osmo-ran/split/ran-trx-ipc/Dockerfile15
-rw-r--r--osmo-ran/split/ran-trx-uhd/Dockerfile15
-rw-r--r--osmo-remsim-latest/Dockerfile3
-rw-r--r--osmo-sgsn-latest/Dockerfile3
-rw-r--r--osmo-sip-latest/Dockerfile3
-rw-r--r--osmo-smlc-latest/Dockerfile3
-rw-r--r--osmo-stp-latest/Dockerfile3
-rw-r--r--osmo-stp-latest/osmo-stp.cfg1
-rw-r--r--osmocom-bb-host-master/Dockerfile4
-rwxr-xr-xttcn3-bsc-test-vamos/jenkins.sh5
-rw-r--r--ttcn3-bsc-test-vamos/osmo-bsc.cfg3
-rwxr-xr-xttcn3-bsc-test/jenkins.sh2
-rw-r--r--ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg2
-rw-r--r--ttcn3-gbproxy-test/osmo-gbproxy.cfg2
-rw-r--r--ttcn3-mgw-test/osmo-mgw.cfg2
-rw-r--r--ttcn3-msc-test/osmo-stp.cfg19
-rw-r--r--ttcn3-pcap-client-test/Dockerfile13
-rw-r--r--ttcn3-pcap-client-test/Makefile3
-rw-r--r--ttcn3-pcap-client-test/OPCAP_CLIENT_Tests.cfg22
-rwxr-xr-xttcn3-pcap-client-test/jenkins.sh38
-rw-r--r--ttcn3-pcap-client-test/osmo-pcap-client.cfg15
-rw-r--r--ttcn3-sgsn-test/osmo-sgsn.cfg1
-rw-r--r--ttcn3-sgsn-test/osmo-stp.cfg19
-rw-r--r--ttcn3-sip-test/osmo-sip-connector.cfg1
74 files changed, 459 insertions, 120 deletions
diff --git a/README.md b/README.md
index 1cd9488..9a1889e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ test automation.
## Running a testsuite
All testsuite folders start with `ttcn3` or `nplab`. Run the following
-to build/update all required containers and start a specific testsuite:
+to build/update all required containers from the "master" branch and
+start a specific testsuite:
```
$ cd ttcn3-mgw-test
@@ -26,6 +27,33 @@ Environment variables:
* `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the
containers (see "caching" below)
+### More examples
+
+latest (debian):
+```
+$ export IMAGE_SUFFIX="latest"
+$ cd ttcn3-mgw-test
+$ ./jenkins.sh
+```
+
+latest-centos8:
+```
+$ export IMAGE_SUFFIX="latest-centos8"
+$ cd ttcn3-mgw-test
+$ ./jenkins.sh
+```
+
+2021q1-centos8:
+```
+export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
+export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
+export OSMOCOM_REPO_PATH="osmo-maintained"
+export OSMOCOM_REPO_VERSION="2021q1"
+export IMAGE_SUFFIX="2021q1-centos8"
+$ cd ttcn3-mgw-test
+$ ./jenkins.sh
+```
+
## Kernel test
OsmoGGSN can be configured to either run completely in userspace, or to
use the GTP-U kernel module. To test the kernel module, OsmoGGSN and
@@ -45,6 +73,10 @@ Environment variables:
* `KERNEL_URL`: git remote url (default: net-next.git on kernel.org)
* `KERNEL_BRANCH` branch to checkout (default: master)
+The OBS repository mirror consists of
+`${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`,
+e.g. `https://download.opensuse.org/repositories/network:/osmocom:/latest/`.
+
### Creating kernel config fragments
For the kernel tests, we are storing kernel config fragments in the git
repository instead of full kernel configs. Generate them as follows:
diff --git a/arm-none-eabi-gcc-4.8.2/Dockerfile b/arm-none-eabi-gcc-4.8.2/Dockerfile
index 8794a95..6c1373c 100644
--- a/arm-none-eabi-gcc-4.8.2/Dockerfile
+++ b/arm-none-eabi-gcc-4.8.2/Dockerfile
@@ -20,7 +20,11 @@ RUN apt update && apt install -y \
flex \
curl \
patch \
- file
+ file \
+ python2.7-minimal \
+ autoconf \
+ libtool \
+ git
# Stage 0: Download and patch the source code
RUN curl -SL ${BINUTILS_SRC} | tar -xj -C /usr/src && \
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 001c161..e36e3f0 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -3,6 +3,7 @@ ARG UPSTREAM_DISTRO=centos:centos8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
# Let package metadata expire after 60 seconds instead of 48 hours
RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
@@ -10,8 +11,15 @@ RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
# Make additional development libraries available from PowerTools and Osmocom nightly (e.g. libdbi)
RUN dnf install -y dnf-utils wget && \
yum config-manager --set-enabled powertools && \
- cd /etc/yum.repos.d/ && \
- wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:nightly/CentOS_8/network:osmocom:nightly.repo
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_nightly]"; \
+ echo "name=Nightly packages of the Osmocom project (CentOS_8)"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > /etc/yum.repos.d/network:osmocom:nightly.repo
RUN dnf install -y \
autoconf \
@@ -54,4 +62,4 @@ RUN dnf install -y \
COPY .common/respawn.sh /usr/local/bin/respawn.sh
# Invalidate cache once the repository is updated
-ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
+ADD ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index a9dfc9b..4e180de 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -3,16 +3,25 @@ ARG UPSTREAM_DISTRO=centos:centos8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO_VERSION="latest"
# Let package metadata expire after 60 seconds instead of 48 hours
RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
# Make additional development libraries available from PowerTools and set up
-# Osmocom latest OBS repository
+# Osmocom OBS repository
RUN dnf install -y dnf-utils wget && \
yum config-manager --set-enabled powertools && \
- cd /etc/yum.repos.d/ && \
- wget $OSMOCOM_REPO_MIRROR/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_MIRROR | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_8/"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_8/repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo"
RUN dnf install -y \
telnet
@@ -21,4 +30,4 @@ RUN dnf install -y \
COPY .common/respawn.sh /usr/local/bin/respawn.sh
# Invalidate cache once the repository is updated
-ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
+ADD ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile
index e909731..10b2c88 100644
--- a/debian-buster-erlang/Dockerfile
+++ b/debian-buster-erlang/Dockerfile
@@ -2,10 +2,11 @@ ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:buster
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
MAINTAINER Harald Welte <laforge@gnumonks.org>
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_10/"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_10/"
# install the erlang vm and rebar (2)
RUN apt-get update && \
diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index baa076a..ff69d35 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -6,6 +6,7 @@ ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
@@ -169,7 +170,7 @@ ENV LANG en_US.UTF-8
# Install packages from Osmocom OBS repositories:
# * osmo-remsim: libulfius
# * osmo-trx: liblimesuite-dev, libuhd-dev
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
COPY .common/Release.key /tmp/Release.key
RUN apt-key add /tmp/Release.key && \
rm /tmp/Release.key && \
diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile
index e07e65a..a8765b9 100644
--- a/debian-buster-simtrace2/Dockerfile
+++ b/debian-buster-simtrace2/Dockerfile
@@ -2,10 +2,11 @@ ARG USER
FROM $USER/debian-buster-build
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
MAINTAINER Harald Welte <laforge@gnumonks.org>
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
COPY .common/Release.key /tmp/Release.key
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index 087a783..d95e249 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -2,10 +2,11 @@ ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:jessie
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
MAINTAINER Harald Welte <laforge@gnumonks.org>
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_8.0/"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/"
COPY .common/Release.key /tmp/Release.key
diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile
index 50d7cf6..4da215f 100644
--- a/debian-stretch-build/Dockerfile
+++ b/debian-stretch-build/Dockerfile
@@ -3,7 +3,8 @@ ARG UPSTREAM_DISTRO=debian:stretch
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/"
RUN apt-get update && \
apt-get upgrade -y && \
diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index 43a4035..162ab84 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -6,6 +6,7 @@ ARG REGISTRY=docker.io
FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
# Make "$DEBIAN_VERSION" available after FROM
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
@@ -169,7 +170,7 @@ ENV LANG en_US.UTF-8
# Install packages from Osmocom OBS repositories:
# * osmo-remsim: libulfius
# * osmo-trx: liblimesuite-dev, libuhd-dev
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/"
COPY .common/Release.key /tmp/Release.key
RUN apt-key add /tmp/Release.key && \
rm /tmp/Release.key && \
diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile
index 3089712..aaf1b43 100644
--- a/debian-stretch-obs-latest/Dockerfile
+++ b/debian-stretch-obs-latest/Dockerfile
@@ -3,7 +3,8 @@ ARG UPSTREAM_DISTRO=debian:stretch
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_9.0/"
RUN apt-get update && \
apt-get upgrade -y && \
diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index e28c556..5b6b134 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -2,11 +2,11 @@ ARG REGISTRY=docker.io
ARG UPSTREAM_DISTRO=debian:stretch
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
# Arguments used after FROM must be specified again
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
MAINTAINER Harald Welte <laforge@gnumonks.org>
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
RUN apt-get update && apt-get install -y \
gnupg
diff --git a/debian10-obs-submit/Dockerfile b/debian10-obs-submit/Dockerfile
new file mode 100644
index 0000000..bc3bbf7
--- /dev/null
+++ b/debian10-obs-submit/Dockerfile
@@ -0,0 +1,26 @@
+# Used by osmo-ci.git scripts/osmocom-packages-docker.sh
+ARG REGISTRY=docker.io
+ARG UPSTREAM_DISTRO=debian:buster
+FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+# Arguments used after FROM must be specified again
+ARG UID
+
+RUN apt-get update && \
+ apt-get upgrade -y && \
+ apt-get install -y --no-install-recommends \
+ debhelper \
+ devscripts \
+ dpkg-dev \
+ git \
+ git-buildpackage \
+ meson \
+ osc \
+ patch \
+ sed \
+ && \
+ apt-get clean
+
+RUN useradd --uid=${UID} -m user
+USER user
+RUN git config --global user.email "obs-submit@docker" && \
+ git config --global user.name "obs-submit"
diff --git a/debian10-obs-submit/Makefile b/debian10-obs-submit/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/debian10-obs-submit/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 1d3e0a3..0f37bed 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -6,7 +6,15 @@ docker_image_exists() {
}
docker_depends() {
+ local feed
+
case "$1" in
+ osmo-*-20*q*-centos8)
+ # e.g. osmo-mgw-2021q1-centos8 -> centos8-obs-2021q1
+ feed="$(echo "$1" | grep -o -P -- "20\d\dq.*$")" # e.g. "2021q1-centos8"
+ feed="$(echo "$feed" | sed 's/\-centos8$//')" # e.g. "2021q1"
+ echo "centos8-obs-$feed"
+ ;;
osmo-*-latest-centos8) echo "centos8-obs-latest" ;;
osmo-*-centos8) echo "centos8-build" ;;
osmo-*-latest) echo "debian-stretch-obs-latest" ;;
@@ -34,8 +42,21 @@ docker_upstream_distro_from_image_name() {
docker_dir_from_image_name() {
case "$1" in
- osmo-*-centos8) echo "$1" | sed 's/\-centos8$//' ;;
- *) echo "$1" ;;
+ osmo-*-20*q*-centos8)
+ # e.g. osmo-mgw-2021q1-centos8 -> osmo-mgw-latest
+ echo "$1" | sed 's/20[0-9][0-9]q.*\-centos8$/latest/'
+ ;;
+ osmo-*-centos8)
+ # e.g. osmo-mgw-latest-centos8 -> osmo-mgw-latest
+ echo "$1" | sed 's/\-centos8$//'
+ ;;
+ centos8-obs-20*q*)
+ # e.g. centos8-obs-2021q1 -> centos8-obs-latest
+ echo "$1" | sed 's/20[0-9][0-9]q.*$/latest/'
+ ;;
+ *)
+ echo "$1"
+ ;;
esac
}
diff --git a/make/Makefile b/make/Makefile
index d2cacf3..edb0890 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -15,6 +15,7 @@
#
REGISTRY_HOST?=docker.io
USERNAME?=$(USER)
+UID=$(shell id -u)
NAME?=$(shell basename $(CURDIR))
LIBOSMOCORE_BRANCH?=master
OSMO_TTCN3_BRANCH?=master
@@ -36,10 +37,23 @@ OSMO_STP_BRANCH?=master
PULL?=
UPSTREAM_DISTRO?=debian:stretch
DISTRO?=debian-stretch
-OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
+
+# Full OBS repository mirror consists of:
+# ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}
+# e.g. "https://download.opensuse.org/repositories/network:/osmocom:/latest/"
+#
# Use if down: OSMOCOM_REPO_MIRROR=http://ftp.uni-stuttgart.de/opensuse
+OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
+OSMOCOM_REPO_PATH?=repositories/network:/osmocom:
+# Use "nightly" to use the nightly feed
OSMOCOM_REPO_VERSION?=latest
-# Use "nightly" to use the nightly repo
+# Build the testsuite with the following mirror. In jenkins we always want to
+# point this to http://download.opensuse.org, so the same testsuite can be
+# used no matter which OSMOCOM_REPO_MIRROR is set. This avoids rebuilding the
+# testsuite when we only want to change OSMOCOM_REPO_MIRROR to build different
+# subjects under test, and it works even if the OSMOCOM_REPO_MIRROR only has
+# a subset of the network:osmocom:latest packages (i.e. no eclipse-titan).
+OSMOCOM_REPO_TESTSUITE_MIRROR?=$(OSMOCOM_REPO_MIRROR)
ROOT_DIR=$(shell git rev-parse --show-toplevel)
RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support
@@ -69,12 +83,15 @@ post-push:
docker-build: .release
docker build \
--build-arg USER=$(USERNAME) \
+ --build-arg UID=$(UID) \
--build-arg REGISTRY=$(REGISTRY_HOST) \
--build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \
--build-arg UPSTREAM_DISTRO=$(UPSTREAM_DISTRO) \
--build-arg DISTRO=$(DISTRO) \
--build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \
+ --build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \
--build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \
+ --build-arg OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \
--build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \
--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
--build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \
diff --git a/nplab-m3ua-test/osmo-stp.cfg b/nplab-m3ua-test/osmo-stp.cfg
index 23d94e0..90ad0d4 100644
--- a/nplab-m3ua-test/osmo-stp.cfg
+++ b/nplab-m3ua-test/osmo-stp.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
@@ -29,7 +28,6 @@ log file /data/osmo-stp.log
logging color 0
logging print category 1
logging timestamp 1
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
diff --git a/nplab-sua-test/osmo-stp.cfg b/nplab-sua-test/osmo-stp.cfg
index a0043df..4adc139 100644
--- a/nplab-sua-test/osmo-stp.cfg
+++ b/nplab-sua-test/osmo-stp.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
@@ -29,7 +28,6 @@ log file /data/osmo-stp.log
logging color 0
logging print category 1
logging timestamp 1
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile
index 3352ed2..e4a6044 100644
--- a/osmo-bsc-latest/Dockerfile
+++ b/osmo-bsc-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile
index 2b41968..ad79cb3 100644
--- a/osmo-bts-latest/Dockerfile
+++ b/osmo-bts-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-bts-latest/osmo-bts.cfg b/osmo-bts-latest/osmo-bts.cfg
index 841f50b..953f24a 100644
--- a/osmo-bts-latest/osmo-bts.cfg
+++ b/osmo-bts-latest/osmo-bts.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 0
logging timestamp 0
- logging level all everything
logging level rsl info
logging level oml debug
logging level rll notice
diff --git a/osmo-bts-master/osmo-bts.cfg b/osmo-bts-master/osmo-bts.cfg
index 841f50b..953f24a 100644
--- a/osmo-bts-master/osmo-bts.cfg
+++ b/osmo-bts-master/osmo-bts.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 0
logging timestamp 0
- logging level all everything
logging level rsl info
logging level oml debug
logging level rll notice
diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile
index d919dae..5361e2f 100644
--- a/osmo-cbc-latest/Dockerfile
+++ b/osmo-cbc-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-cn-latest/Dockerfile b/osmo-cn-latest/Dockerfile
index 3da7175..e17efee 100644
--- a/osmo-cn-latest/Dockerfile
+++ b/osmo-cn-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
RUN apt-get update && \
diff --git a/osmo-cn-latest/osmo-mgw.cfg b/osmo-cn-latest/osmo-mgw.cfg
index c206914..93333cf 100644
--- a/osmo-cn-latest/osmo-mgw.cfg
+++ b/osmo-cn-latest/osmo-mgw.cfg
@@ -7,7 +7,6 @@ log file /data/osmo-mgw.log
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
logging level rtp notice
logging level lglobal notice
logging level llapd notice
@@ -39,7 +38,7 @@ mgcp
rtp port-range 4002 16000
rtp bind-ip 192.168.42.10
rtp ip-probing
- rtp ip-dscp 184
+ rtp ip-dscp 46
no rtp keep-alive
no rtcp-omit
no rtp-patch
diff --git a/osmo-cn-latest/osmo-msc.cfg b/osmo-cn-latest/osmo-msc.cfg
index 3015850..c7649fc 100644
--- a/osmo-cn-latest/osmo-msc.cfg
+++ b/osmo-cn-latest/osmo-msc.cfg
@@ -6,7 +6,7 @@ log file /data/osmo-msc.log
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
+ logging level set-all debug
!
line vty
no login
diff --git a/osmo-cn-latest/osmo-msc.cfg.base b/osmo-cn-latest/osmo-msc.cfg.base
index 042d847..da61a49 100644
--- a/osmo-cn-latest/osmo-msc.cfg.base
+++ b/osmo-cn-latest/osmo-msc.cfg.base
@@ -6,7 +6,7 @@ log file /data/osmo-msc.log
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
+ logging level set-all debug
!
line vty
no login
diff --git a/osmo-cn-latest/osmo-sgsn.cfg b/osmo-cn-latest/osmo-sgsn.cfg
index ef18604..19e2c5e 100644
--- a/osmo-cn-latest/osmo-sgsn.cfg
+++ b/osmo-cn-latest/osmo-sgsn.cfg
@@ -7,7 +7,7 @@ log file /data/osmo-sgsn.log
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
+ logging level set-all debug
!
line vty
no login
diff --git a/osmo-cn-latest/osmo-stp.cfg b/osmo-cn-latest/osmo-stp.cfg
index 96524de..b40c3b0 100644
--- a/osmo-cn-latest/osmo-stp.cfg
+++ b/osmo-cn-latest/osmo-stp.cfg
@@ -7,7 +7,6 @@ log file /data/osmo-stp.log
logging color 0
logging print category 1
logging timestamp 1
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
diff --git a/osmo-gbproxy-latest/Dockerfile b/osmo-gbproxy-latest/Dockerfile
index 7c729a5..5e16f99 100644
--- a/osmo-gbproxy-latest/Dockerfile
+++ b/osmo-gbproxy-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile
index 0da9703..e5408e3 100644
--- a/osmo-ggsn-latest/Dockerfile
+++ b/osmo-ggsn-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile
index ece7aa6..b0a06d0 100644
--- a/osmo-hlr-latest/Dockerfile
+++ b/osmo-hlr-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile
index 81fdead..f71751d 100644
--- a/osmo-hnbgw-latest/Dockerfile
+++ b/osmo-hnbgw-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
RUN apt-get update && \
diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile
index 5b01fe8..ede6cb1 100644
--- a/osmo-mgw-latest/Dockerfile
+++ b/osmo-mgw-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg
index 23d5603..8427528 100644
--- a/osmo-mgw-latest/osmo-mgw.cfg
+++ b/osmo-mgw-latest/osmo-mgw.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 1
logging timestamp 1
- logging level all everything
logging level rtp notice
logging level lglobal notice
logging level llapd notice
@@ -38,7 +37,7 @@ mgcp
rtp port-range 4002 16000
rtp bind-ip 172.18.0.180
rtp ip-probing
- rtp ip-dscp 184
+ rtp ip-dscp 46
no rtp keep-alive
no rtcp-omit
no rtp-patch
diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg
index 8f07294..27cd0a0 100644
--- a/osmo-mgw-master/osmo-mgw.cfg
+++ b/osmo-mgw-master/osmo-mgw.cfg
@@ -7,7 +7,6 @@ log stderr
logging color 1
logging print category 1
logging timestamp 0
- logging level all everything
logging level rtp notice
logging level lglobal notice
logging level llapd notice
diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile
index 29e932a..cc18602 100644
--- a/osmo-msc-latest/Dockerfile
+++ b/osmo-msc-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-nitb-latest/Dockerfile b/osmo-nitb-latest/Dockerfile
index 8c3acb8..bd4f73b 100644
--- a/osmo-nitb-latest/Dockerfile
+++ b/osmo-nitb-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-nitb-latest/openbsc.cfg b/osmo-nitb-latest/openbsc.cfg
index 31c9a0c..6166d7e 100644
--- a/osmo-nitb-latest/openbsc.cfg
+++ b/osmo-nitb-latest/openbsc.cfg
@@ -8,7 +8,6 @@ log stderr
logging color 1
logging print category 0
logging timestamp 0
- logging level all everything
logging level rll notice
logging level cc notice
logging level mm debug
diff --git a/osmo-nitb-master/openbsc.cfg b/osmo-nitb-master/openbsc.cfg
index 31c9a0c..6166d7e 100644
--- a/osmo-nitb-master/openbsc.cfg
+++ b/osmo-nitb-master/openbsc.cfg
@@ -8,7 +8,6 @@ log stderr
logging color 1
logging print category 0
logging timestamp 0
- logging level all everything
logging level rll notice
logging level cc notice
logging level mm debug
diff --git a/osmo-pcap-latest/Dockerfile b/osmo-pcap-latest/Dockerfile
new file mode 100644
index 0000000..7cb4d79
--- /dev/null
+++ b/osmo-pcap-latest/Dockerfile
@@ -0,0 +1,29 @@
+ARG USER
+ARG DISTRO
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
+# Arguments used after FROM must be specified again
+ARG DISTRO
+
+RUN case "$DISTRO" in \
+ debian*) \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ osmo-pcap-client osmo-pcap-server && \
+ apt-get clean \
+ ;; \
+ centos*) \
+ dnf install -y \
+ osmo-pcap-client osmo-pcap-server \
+ ;; \
+ esac
+
+WORKDIR /data
+
+VOLUME /data
+COPY osmo-pcap-client.cfg /data/
+#COPY osmo-pcap-server.cfg /data/
+
+CMD ["/bin/sh", "-c", "/usr/bin/osmo-pcap-clint -c /data/osmo-pcap-client.cfg >/data/osmo-pcap-client.log 2>&1"]
+
+EXPOSE 4237
diff --git a/osmo-pcap-latest/Makefile b/osmo-pcap-latest/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/osmo-pcap-latest/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-pcap-latest/osmo-pcap-client.cfg b/osmo-pcap-latest/osmo-pcap-client.cfg
new file mode 100644
index 0000000..89f1801
--- /dev/null
+++ b/osmo-pcap-latest/osmo-pcap-client.cfg
@@ -0,0 +1,14 @@
+!
+! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty
+!!
+!
+!
+line vty
+ no login
+!
+client
+ pcap device lo
+ pcap filter udp port 44423
+ pcap detect-loop 0
+ server ip 127.0.0.1
+ server port 5000
diff --git a/osmo-pcap-master/Dockerfile b/osmo-pcap-master/Dockerfile
new file mode 100644
index 0000000..a2b75c1
--- /dev/null
+++ b/osmo-pcap-master/Dockerfile
@@ -0,0 +1,51 @@
+ARG USER
+ARG DISTRO
+FROM $USER/$DISTRO-build
+# Arguments used after FROM must be specified again
+ARG DISTRO
+
+RUN case "$DISTRO" in \
+ debian*) \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ libosmocore-dev \
+ libosmo-netif-dev \
+ libzmq3-dev \
+ && \
+ apt-get clean \
+ ;; \
+ centos*) \
+ dnf install -y \
+ "pkgconfig(libosmo-netif)" \
+ "pkgconfig(libosmocore)" \
+ "pkgconfig(libosmoctrl)" \
+ "pkgconfig(libosmogsm)" \
+ "pkgconfig(libosmovty)" \
+ "pkgconfig(libzmq)" \
+ ;; \
+ esac
+
+WORKDIR /tmp
+
+ARG OSMO_PCAP_BRANCH="master"
+
+RUN git clone git://git.osmocom.org/osmo-pcap.git
+ADD http://git.osmocom.org/osmo-pcap/patch?h=$OSMO_PCAP_BRANCH /tmp/commit-osmo-pcap
+
+RUN cd osmo-pcap && \
+ git fetch && git checkout $OSMO_PCAP_BRANCH && \
+ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_PCAP_BRANCH || exit 1); \
+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+ autoreconf -fi && \
+ ./configure && \
+ make "-j$(nproc)" install
+
+VOLUME /data
+
+COPY osmo-pcap-client.cfg /data/osmo-pcap-client.cfg
+#COPY osmo-pcap-server.cfg /data/osmo-pcap-server.cfg
+
+WORKDIR /data
+CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-pcap-client -c /data/osmo-pcap-client.cfg > /data/osmo-pcap-client.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-pcap-master/Makefile b/osmo-pcap-master/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/osmo-pcap-master/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-pcap-master/osmo-pcap-client.cfg b/osmo-pcap-master/osmo-pcap-client.cfg
new file mode 100644
index 0000000..89f1801
--- /dev/null
+++ b/osmo-pcap-master/osmo-pcap-client.cfg
@@ -0,0 +1,14 @@
+!
+! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty
+!!
+!
+!
+line vty
+ no login
+!
+client
+ pcap device lo
+ pcap filter udp port 44423
+ pcap detect-loop 0
+ server ip 127.0.0.1
+ server port 5000
diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile
index 7f1b3ac..bb1fe41 100644
--- a/osmo-pcu-latest/Dockerfile
+++ b/osmo-pcu-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile
index 3a5dac9..61978ed 100644
--- a/osmo-ran/Dockerfile
+++ b/osmo-ran/Dockerfile
@@ -3,12 +3,13 @@ FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
-ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
COPY .common/Release.key /tmp/Release.key
@@ -26,7 +27,15 @@ RUN case "$DISTRO" in \
dnf install -y dnf-utils wget && \
yum config-manager --set-enabled PowerTools && \
cd /etc/yum.repos.d/ && \
- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
;; \
esac
diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile
index b433d72..0cf8347 100644
--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile
+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile
@@ -3,12 +3,13 @@ FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
-ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
COPY .common/Release.key /tmp/Release.key
@@ -26,7 +27,15 @@ RUN case "$DISTRO" in \
dnf install -y dnf-utils wget && \
yum config-manager --set-enabled PowerTools && \
cd /etc/yum.repos.d/ && \
- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
;; \
esac
diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile
index f30e3d2..e49b8b1 100644
--- a/osmo-ran/split/ran-bts_pcu/Dockerfile
+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile
@@ -3,12 +3,13 @@ FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
-ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
COPY .common/Release.key /tmp/Release.key
@@ -26,7 +27,15 @@ RUN case "$DISTRO" in \
dnf install -y dnf-utils wget && \
yum config-manager --set-enabled PowerTools && \
cd /etc/yum.repos.d/ && \
- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
;; \
esac
diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile
index 0720ccc..bcd84cb 100644
--- a/osmo-ran/split/ran-trx-ipc/Dockerfile
+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile
@@ -3,12 +3,13 @@ FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
-ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
COPY .common/Release.key /tmp/Release.key
@@ -26,7 +27,15 @@ RUN case "$DISTRO" in \
dnf install -y dnf-utils wget && \
yum config-manager --set-enabled PowerTools && \
cd /etc/yum.repos.d/ && \
- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
;; \
esac
diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile
index 5431210..08baa07 100644
--- a/osmo-ran/split/ran-trx-uhd/Dockerfile
+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile
@@ -3,12 +3,13 @@ FROM $USER/systemd
# Arguments used after FROM must be specified again
ARG DISTRO
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
ARG OSMOCOM_REPO_VERSION=latest
MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
-ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
COPY .common/Release.key /tmp/Release.key
@@ -26,7 +27,15 @@ RUN case "$DISTRO" in \
dnf install -y dnf-utils wget && \
yum config-manager --set-enabled PowerTools && \
cd /etc/yum.repos.d/ && \
- wget ${OSMOCOM_REPO_CENTOS}/network:osmocom:$OSMOCOM_REPO_VERSION.repo \
+ export MIRROR_HTTPS="$(echo $OSMOCOM_REPO_CENTOS | sed s/^http:/https:/)" && \
+ { echo "[network_osmocom_${OSMOCOM_REPO_VERSION}]"; \
+ echo "name=Osmocom ${OSMOCOM_REPO_VERSION}"; \
+ echo "type=rpm-md"; \
+ echo "baseurl=${OSMOCOM_REPO_CENTOS}"; \
+ echo "gpgcheck=1"; \
+ echo "gpgkey=${MIRROR_HTTPS}repodata/repomd.xml.key"; \
+ echo "enabled=1"; \
+ } > "/etc/yum.repos.d/network:osmocom:${OSMOCOM_REPO_VERSION}.repo" \
;; \
esac
diff --git a/osmo-remsim-latest/Dockerfile b/osmo-remsim-latest/Dockerfile
index db1aa05..991c97e 100644
--- a/osmo-remsim-latest/Dockerfile
+++ b/osmo-remsim-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
RUN apt-get update && \
diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile
index 21728c9..c816026 100644
--- a/osmo-sgsn-latest/Dockerfile
+++ b/osmo-sgsn-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile
index 825735c..d70341b 100644
--- a/osmo-sip-latest/Dockerfile
+++ b/osmo-sip-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-smlc-latest/Dockerfile b/osmo-smlc-latest/Dockerfile
index 12487ec..6d9299b 100644
--- a/osmo-smlc-latest/Dockerfile
+++ b/osmo-smlc-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile
index d3279f0..5a22bc7 100644
--- a/osmo-stp-latest/Dockerfile
+++ b/osmo-stp-latest/Dockerfile
@@ -1,6 +1,7 @@
ARG USER
ARG DISTRO
-FROM $USER/$DISTRO-obs-latest
+ARG OSMOCOM_REPO_VERSION="latest"
+FROM $USER/$DISTRO-obs-$OSMOCOM_REPO_VERSION
# Arguments used after FROM must be specified again
ARG DISTRO
diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg
index e06a9e0..c4b7d41 100644
--- a/osmo-stp-latest/osmo-stp.cfg
+++ b/osmo-stp-latest/osmo-stp.cfg
@@ -6,7 +6,6 @@
logging color 1
logging print category 1
logging timestamp 1
- logging level all everything
logging level lglobal notice
logging level llapd notice
logging level linp debug
diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile
index 53b8dcc..2e86767 100644
--- a/osmocom-bb-host-master/Dockerfile
+++ b/osmocom-bb-host-master/Dockerfile
@@ -4,13 +4,13 @@ ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
FROM $USER/$DISTRO-build
# Arguments used after FROM must be specified again
ARG DISTRO
-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
MAINTAINER Harald Welte <laforge@gnumonks.org>
ARG OSMO_BB_BRANCH="master"
-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
COPY .common/Release.key /tmp/Release.key
diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh
index 9255db2..197bac3 100755
--- a/ttcn3-bsc-test-vamos/jenkins.sh
+++ b/ttcn3-bsc-test-vamos/jenkins.sh
@@ -74,13 +74,10 @@ for i in `seq 0 2`; do
$(docker_network_params $SUBNET 10$i) \
--ulimit core=-1 \
-v $VOL_BASE_DIR/bts-omldummy:/data \
- $ADD_BSC_VOLUMES \
--name ${BUILD_TAG}-bts$i -d \
$DOCKER_ARGS \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
- sleep 9999999
-
- # /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy -f VAMOS 172.18.31.20 $((i + 1234)) 1" # " >>/data/osmo-bts-omldummy-${i}.log 2>&1"
+ /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy -f VAMOS 172.18.31.20 $((i + 1234)) 1" # " >>/data/osmo-bts-omldummy-${i}.log 2>&1"
done
echo Starting container with BSC testsuite
diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
index d2e5221..571fded 100644
--- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg
+++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
@@ -11,8 +11,11 @@ log stderr
logging filter all 1
logging color 1
logging print category 1
+ logging print category-hex 0
logging timestamp 1
logging print extended-timestamp 1
+ logging print file basename last
+ logging print level 1
logging level all everything
logging level rll notice
logging level mm notice
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 49362c6..4c6e186 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -77,7 +77,7 @@ for i in `seq 0 2`; do
--name ${BUILD_TAG}-bts$i -d \
$DOCKER_ARGS \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
- /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1" # " >>/data/osmo-bts-omldummy-${i}.log 2>&1"
+ /bin/sh -c "SLEEP_BEFORE_RESPAWN=1 /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1" # " >>/data/osmo-bts-omldummy-${i}.log 2>&1"
done
echo Starting container with BSC testsuite
diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
index f38f23a..9b53db5 100644
--- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
@@ -13,7 +13,7 @@ log stderr
logging timestamp 1
logging print extended-timestamp 1
logging print file 1
- logging level all everything
+ logging level set-all debug
!
line vty
no login
diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg
index 2eb9824..c98980b 100644
--- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg
@@ -13,7 +13,7 @@ log stderr
logging timestamp 1
logging print extended-timestamp 1
logging print file 1
- logging level all everything
+ logging level set-all debug
!
line vty
no login
diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg
index 1c49b11..f8e1a0d 100644
--- a/ttcn3-mgw-test/osmo-mgw.cfg
+++ b/ttcn3-mgw-test/osmo-mgw.cfg
@@ -33,7 +33,7 @@ mgcp
rtp bind-ip 172.18.4.180
rtp bind-ip-v6 fd02:db8:4::180
rtp ip-probing
- rtp ip-dscp 184
+ rtp ip-dscp 46
no rtp keep-alive
no rtcp-omit
no rtp-patch
diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg
index 5fc4abd..8e5ad82 100644
--- a/ttcn3-msc-test/osmo-stp.cfg
+++ b/ttcn3-msc-test/osmo-stp.cfg
@@ -12,24 +12,7 @@ log stderr
logging print category 1
logging timestamp 1
logging print extended-timestamp 1
- logging level all everything
- logging level lglobal notice
- logging level llapd notice
- logging level linp notice
- logging level lmux notice
- logging level lmi notice
- logging level lmib notice
- logging level lsms notice
- logging level lctrl notice
- logging level lgtp notice
- logging level lstats notice
- logging level lgsup notice
- logging level loap notice
- logging level lss7 debug
- logging level lsccp debug
- logging level lsua debug
- logging level lm3ua debug
- logging level lmgcp notice
+ logging level set-all debug
!
line vty
no login
diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile
new file mode 100644
index 0000000..2a3799f
--- /dev/null
+++ b/ttcn3-pcap-client-test/Dockerfile
@@ -0,0 +1,13 @@
+ARG REGISTRY
+ARG USER
+FROM $REGISTRY/$USER/debian-stretch-titan
+ARG OSMO_TTCN3_BRANCH="master"
+
+ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcap-client
+
+VOLUME /data
+
+COPY OPCAP_CLIENT_Tests.cfg /data/OPCAP_CLIENT_Tests.cfg
+
+CMD ttcn3-docker-run pcap-client OPCAP_CLIENT_Tests
diff --git a/ttcn3-pcap-client-test/Makefile b/ttcn3-pcap-client-test/Makefile
new file mode 100644
index 0000000..1c6de69
--- /dev/null
+++ b/ttcn3-pcap-client-test/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm
+
+include ../make/Makefile
diff --git a/ttcn3-pcap-client-test/OPCAP_CLIENT_Tests.cfg b/ttcn3-pcap-client-test/OPCAP_CLIENT_Tests.cfg
new file mode 100644
index 0000000..e76fc4f
--- /dev/null
+++ b/ttcn3-pcap-client-test/OPCAP_CLIENT_Tests.cfg
@@ -0,0 +1,22 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/pcap-client/OPCAP_CLIENT_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+*.VTY.CTRL_HOSTNAME := "172.18.31.20";
+
+[MODULE_PARAMETERS]
+OPCAP_CLIENT_Tests.mp_local_opcap_ip := "172.18.31.10";
+OPCAP_CLIENT_Tests.mp_local_opcap_port := 5000;
+OPCAP_CLIENT_Tests.mp_traffic_a := { "172.18.31.10", 44423 };
+OPCAP_CLIENT_Tests.mp_traffic_b := { "172.18.31.20", 44442 };
+
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+OPCAP_CLIENT_Tests.control
diff --git a/ttcn3-pcap-client-test/jenkins.sh b/ttcn3-pcap-client-test/jenkins.sh
new file mode 100755
index 0000000..60d44e6
--- /dev/null
+++ b/ttcn3-pcap-client-test/jenkins.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "osmo-pcap-$IMAGE_SUFFIX" \
+ "ttcn3-pcap-client-test"
+
+set_clean_up_trap
+set -e
+
+mkdir $VOL_BASE_DIR/pcap-client-tester
+cp OPCAP_CLIENT_Tests.cfg $VOL_BASE_DIR/pcap-client-tester/
+
+mkdir $VOL_BASE_DIR/pcap-client
+cp osmo-pcap-client.cfg $VOL_BASE_DIR/pcap-client/
+
+SUBNET=31
+network_create $SUBNET
+
+echo Starting container with pcap-client
+docker run --rm \
+ $(docker_network_params $SUBNET 20) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/pcap-client:/data \
+ --name ${BUILD_TAG}-pcap-client -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-pcap-$IMAGE_SUFFIX
+
+echo Starting container with pcap-client testsuite
+docker run --rm \
+ $(docker_network_params $SUBNET 10) \
+ --ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
+ -v $VOL_BASE_DIR/pcap-client-tester:/data \
+ --name ${BUILD_TAG}-ttcn3-pcap-client-test \
+ $DOCKER_ARGS \
+ $REPO_USER/ttcn3-pcap-client-test
diff --git a/ttcn3-pcap-client-test/osmo-pcap-client.cfg b/ttcn3-pcap-client-test/osmo-pcap-client.cfg
new file mode 100644
index 0000000..7394c96
--- /dev/null
+++ b/ttcn3-pcap-client-test/osmo-pcap-client.cfg
@@ -0,0 +1,15 @@
+!
+! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty
+!!
+!
+!
+line vty
+ no login
+ bind 0.0.0.0
+!
+client
+ pcap device eth0
+ pcap filter udp port 44423
+ pcap detect-loop 0
+ server ip 172.18.31.10
+ server port 5000
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 1dcac1a..e073e25 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -14,7 +14,6 @@ log stderr
logging print category-hex 0
logging print extended-timestamp 1
logging print file basename last
- logging level all everything
logging level mm debug
logging level pag notice
logging level meas notice
diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg
index 3ee0668..127a2c5 100644
--- a/ttcn3-sgsn-test/osmo-stp.cfg
+++ b/ttcn3-sgsn-test/osmo-stp.cfg
@@ -12,24 +12,7 @@ log stderr
logging print category 1
logging timestamp 1
logging print extended-timestamp 1
- logging level all everything
- logging level lglobal notice
- logging level llapd notice
- logging level linp notice
- logging level lmux notice
- logging level lmi notice
- logging level lmib notice
- logging level lsms notice
- logging level lctrl notice
- logging level lgtp notice
- logging level lstats notice
- logging level lgsup notice
- logging level loap notice
- logging level lss7 debug
- logging level lsccp debug
- logging level lsua debug
- logging level lm3ua debug
- logging level lmgcp notice
+ logging level set-all debug
!
line vty
no login
diff --git a/ttcn3-sip-test/osmo-sip-connector.cfg b/ttcn3-sip-test/osmo-sip-connector.cfg
index 7f54c1c..5d0a451 100644
--- a/ttcn3-sip-test/osmo-sip-connector.cfg
+++ b/ttcn3-sip-test/osmo-sip-connector.cfg
@@ -13,7 +13,6 @@ log stderr
logging timestamp 1
logging print extended-timestamp 1
logging print file basename
- logging level all everything
logging level sip debug
logging level mncc debug
logging level app debug