diff --git a/jenkins-common.sh b/jenkins-common.sh index f91c6151..f069ffc1 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -23,7 +23,7 @@ docker_depends() { osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; - ttcn3-*) echo "debian-bullseye-titan" ;; + ttcn3-*) echo "debian-bookworm-titan" ;; esac } @@ -147,7 +147,7 @@ docker_images_require() { # they are up-to-date. if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then case "$i" in - debian-bullseye-titan) + debian-bookworm-titan) docker pull "$REGISTRY_HOST/$USER/$i" continue ;; diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 1b716712..3db87459 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -6,7 +6,7 @@ docker_images_require \ "debian-buster-build" \ "sigtran-tests" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "nplab-m3ua-test" set_clean_up_trap diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index 6ee52eeb..a9fbadf6 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -5,7 +5,7 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ "debian-buster-build" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "sigtran-tests" \ "nplab-sua-test" diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index eac8f460..963c8de7 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-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index eac8f460..963c8de7 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 07377c80..67489756 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 386ac3b5..e99a7c60 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 4048f20b..784eb255 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index f237e8ba..961eeefa 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c215d62d..1026180e 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 36778c9e..447ddebc 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index e8b80a80..df3396da 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-hnbgw-test/Dockerfile b/ttcn3-hnbgw-test/Dockerfile index c37e1bfa..3b4e930f 100644 --- a/ttcn3-hnbgw-test/Dockerfile +++ b/ttcn3-hnbgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 6783abd5..df6cb942 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bfc0b9ee..e8aad683 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-mme-test-ogs/Dockerfile b/ttcn3-mme-test-ogs/Dockerfile index 048a8e8c..0f9d6884 100644 --- a/ttcn3-mme-test-ogs/Dockerfile +++ b/ttcn3-mme-test-ogs/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 9bcd891b..6fe48d46 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 12ebee4d..1c315137 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index d39f4935..aa103372 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 10c829bc..7cfd9402 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-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index e97ac409..9ed86904 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-pgw-test/Dockerfile b/ttcn3-pgw-test/Dockerfile index 5233c5ea..5e539020 100644 --- a/ttcn3-pgw-test/Dockerfile +++ b/ttcn3-pgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b902e2da..650c07cd 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 68fd2c03..8d527873 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index da670443..eba4ddd2 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 53d70db3..7418ea64 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index f5dd8908..6c41c1c7 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 256132d9..995ef53e 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit diff --git a/ttcn3-upf-test/Dockerfile b/ttcn3-upf-test/Dockerfile index c0e3d6cf..665d818a 100644 --- a/ttcn3-upf-test/Dockerfile +++ b/ttcn3-upf-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan ARG OSMO_TTCN3_BRANCH="master" ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BRANCH?format=TEXT /tmp/commit