diff --git a/debian-stretch-titan/.release b/debian-bullseye-titan/.release similarity index 100% rename from debian-stretch-titan/.release rename to debian-bullseye-titan/.release diff --git a/debian-stretch-titan/Dockerfile b/debian-bullseye-titan/Dockerfile similarity index 97% rename from debian-stretch-titan/Dockerfile rename to debian-bullseye-titan/Dockerfile index d3489147..bf99534c 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -1,12 +1,12 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=debian:stretch +ARG UPSTREAM_DISTRO=debian:bullseye FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" MAINTAINER Harald Welte -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 \ gnupg diff --git a/debian-stretch-titan/Makefile b/debian-bullseye-titan/Makefile similarity index 100% rename from debian-stretch-titan/Makefile rename to debian-bullseye-titan/Makefile diff --git a/debian-stretch-titan/pipework b/debian-bullseye-titan/pipework similarity index 100% rename from debian-stretch-titan/pipework rename to debian-bullseye-titan/pipework diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-bullseye-titan/ttcn3-docker-prepare.sh similarity index 100% rename from debian-stretch-titan/ttcn3-docker-prepare.sh rename to debian-bullseye-titan/ttcn3-docker-prepare.sh diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-bullseye-titan/ttcn3-docker-run.sh similarity index 100% rename from debian-stretch-titan/ttcn3-docker-run.sh rename to debian-bullseye-titan/ttcn3-docker-run.sh diff --git a/jenkins-common.sh b/jenkins-common.sh index 2e91c14a..9610676b 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -21,7 +21,7 @@ docker_depends() { osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-stretch-obs-latest" ;; osmo-*) echo "debian-stretch-build" ;; - ttcn3-*) echo "debian-stretch-titan" ;; + ttcn3-*) echo "debian-bullseye-titan" ;; esac } @@ -135,7 +135,7 @@ docker_images_require() { # they are up-to-date. if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then case "$i" in - debian-stretch-titan) + debian-bullseye-titan) docker pull "$REGISTRY_HOST/$USER/$i" continue ;; diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 3be308a6..c4250b0f 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -6,7 +6,7 @@ docker_images_require \ "debian-stretch-build" \ "sigtran-tests" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ + "debian-bullseye-titan" \ "nplab-m3ua-test" set_clean_up_trap diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index 1923c385..a29e0008 100644 --- a/ttcn3-bsc-test-vamos/Dockerfile +++ b/ttcn3-bsc-test-vamos/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 1923c385..a29e0008 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 50ca9269..15e7727e 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 8ac7cb85..d676bf03 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 8eba25f6..7c1e6c59 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 4a70c121..11589f6b 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 71494d90..a2216b2d 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index d42ac3ec..252e8931 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 84802882..ac5ca4f9 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 9659dd10..2071cab8 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 087dc09d..c8eeb2b7 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 05610a47..8c67bbfa 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 45bf69e6..31552718 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index 850046d8..b94de1ba 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 2a3799fb..9e66326d 100644 --- a/ttcn3-pcap-client-test/Dockerfile +++ b/ttcn3-pcap-client-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index e42bca1c..b7cb21a5 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index caa6da1f..e94c55c6 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 708a72f8..f43a5dd8 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 333b5ed7..b581b43a 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 1324ac0a..7dd4756d 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 5d27cebb..0d5b0da0 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index e36935b5..7808704d 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit