titan: move from debian-stetch-titan to debian-bullseye-titan
So far we were executing all our TTCN-3 tests from a container image with Debian stretch (9) plus a custom more recent eclipse-titan package from the osmocom feed. Let's update the container base OS from stretch (9) to bullseye (11) while using the same packaged eclipse-titan version (8.0.0) for running the tests. So this should be a low-risk change, as titan runtime remains identical. I've executed all test suites locally and couldn't see any regressions. Related: OS#4969 Change-Id: Ib3bdfa3bec8f8ef42c55ca61cdee8fbca923874f
This commit is contained in:
parent
6f43284ee5
commit
0f74af6083
|
@ -1,12 +1,12 @@
|
||||||
ARG REGISTRY=docker.io
|
ARG REGISTRY=docker.io
|
||||||
ARG UPSTREAM_DISTRO=debian:stretch
|
ARG UPSTREAM_DISTRO=debian:bullseye
|
||||||
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
|
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
|
ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
|
||||||
|
|
||||||
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
||||||
|
|
||||||
ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
|
ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
gnupg
|
gnupg
|
|
@ -21,7 +21,7 @@ docker_depends() {
|
||||||
osmo-*-centos8) echo "centos8-build" ;;
|
osmo-*-centos8) echo "centos8-build" ;;
|
||||||
osmo-*-latest) echo "debian-stretch-obs-latest" ;;
|
osmo-*-latest) echo "debian-stretch-obs-latest" ;;
|
||||||
osmo-*) echo "debian-stretch-build" ;;
|
osmo-*) echo "debian-stretch-build" ;;
|
||||||
ttcn3-*) echo "debian-stretch-titan" ;;
|
ttcn3-*) echo "debian-bullseye-titan" ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ docker_images_require() {
|
||||||
# they are up-to-date.
|
# they are up-to-date.
|
||||||
if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then
|
if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then
|
||||||
case "$i" in
|
case "$i" in
|
||||||
debian-stretch-titan)
|
debian-bullseye-titan)
|
||||||
docker pull "$REGISTRY_HOST/$USER/$i"
|
docker pull "$REGISTRY_HOST/$USER/$i"
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -6,7 +6,7 @@ docker_images_require \
|
||||||
"debian-stretch-build" \
|
"debian-stretch-build" \
|
||||||
"sigtran-tests" \
|
"sigtran-tests" \
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
"debian-bullseye-titan" \
|
||||||
"nplab-m3ua-test"
|
"nplab-m3ua-test"
|
||||||
|
|
||||||
set_clean_up_trap
|
set_clean_up_trap
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ARG REGISTRY
|
ARG REGISTRY
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $REGISTRY/$USER/debian-stretch-titan
|
FROM $REGISTRY/$USER/debian-bullseye-titan
|
||||||
ARG OSMO_TTCN3_BRANCH="master"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
Loading…
Reference in New Issue