From 7c53c9e60da8f4cdad054d8914ab42a1a25ab7d1 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 27 Mar 2019 11:31:48 +0000 Subject: [PATCH] Switch all osmo-*-master and ttcn3-*-test from jessie to stretch Jessie will be EOL in June 2019, let's make the switch to stretch before that. Change-Id: I37a534d07081f3d321869c86d49d03171c8da0c6 --- README.md | 4 ++-- jenkins-common.sh | 4 ++-- nplab-m3ua-test/jenkins.sh | 2 +- nplab-sua-test/jenkins.sh | 2 +- osmo-bsc-master/Dockerfile | 4 ++-- osmo-bts-master/Dockerfile | 4 ++-- osmo-ggsn-master/Dockerfile | 4 ++-- osmo-hlr-master/Dockerfile | 4 ++-- osmo-hnbgw-master/Dockerfile | 4 ++-- osmo-mgw-master/Dockerfile | 4 ++-- osmo-msc-master/Dockerfile | 4 ++-- osmo-nitb-master/Dockerfile | 4 ++-- osmo-pcu-master/Dockerfile | 4 ++-- osmo-sgsn-master/Dockerfile | 4 ++-- osmo-sip-master/Dockerfile | 4 ++-- osmo-stp-master/Dockerfile | 4 ++-- osmocom-bb-host-master/Dockerfile | 4 ++-- sctp-test/Dockerfile | 2 +- sigtran-tests/Dockerfile | 2 +- ttcn3-bsc-test/jenkins-sccplite.sh | 2 +- ttcn3-bsc-test/jenkins.sh | 2 +- ttcn3-bscnat-test/jenkins.sh | 2 +- ttcn3-bts-test/jenkins.sh | 2 +- ttcn3-ggsn-test/jenkins.sh | 2 +- ttcn3-hlr-test/jenkins.sh | 2 +- ttcn3-mgw-test/jenkins.sh | 2 +- ttcn3-msc-test/jenkins.sh | 2 +- ttcn3-pcu-test/jenkins-sns.sh | 2 +- ttcn3-pcu-test/jenkins.sh | 2 +- ttcn3-sgsn-test/jenkins.sh | 2 +- ttcn3-sip-test/jenkins.sh | 2 +- 31 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 49772561..05ee31f6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Most folders in this repository contain a `Dockerfile`. Build a docker container with the same name as the folder like this: ``` -$ cd debian-jessie-build +$ cd debian-stretch-build $ make ``` @@ -50,7 +50,7 @@ each `jenkins.sh`: . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ diff --git a/jenkins-common.sh b/jenkins-common.sh index 7c8e2311..2c4288e1 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -30,12 +30,12 @@ network_remove() { } fix_perms() { - docker_images_require debian-jessie-build + docker_images_require debian-stretch-build echo Fixing permissions docker run --rm \ -v $VOL_BASE_DIR:/data \ --name ${BUILD_TAG}-cleaner \ - $REPO_USER/debian-jessie-build \ + $REPO_USER/debian-stretch-build \ chmod -R a+rX /data/ } diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 800c5b2d..103ea13a 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "nplab-m3ua-test" diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index fea5cf07..56a323de 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "sigtran-tests" \ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5d3d2d5f..61ac8e42 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 25d6d664..be580818 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index bd8d815f..ca4f1118 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 07d175d7..75f29d9f 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 068025bc..4334e4f0 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index dcfa7dad..c333b1db 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 619dda18..49be9c83 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index 94563b1e..bed228ec 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 96844102..e33748a6 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index f941e9c6..87513cc1 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 7340bb32..58542211 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 57afbb7f..7c59fb0c 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -1,9 +1,9 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 8311f80f..260f3813 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,11 +1,11 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte ARG OSMO_BB_BRANCH="master" -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY Release.key /tmp/Release.key diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index fe5db70b..79df64d6 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -1,5 +1,5 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index b09fa09a..ebfb0278 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,5 +1,5 @@ ARG USER -FROM $USER/debian-jessie-build +FROM $USER/debian-stretch-build MAINTAINER Harald Welte diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 0a6ecf30..0a2ff8be 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index ec8c23ed..af5c9655 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index df45b0aa..10d7d62a 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-nitb-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-bscnat-test" diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index b287a787..eb96e596 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -4,7 +4,7 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" # NOTE: there is no osmocom-bb-host-latest, hence always use master! docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ "osmocom-bb-host-master" \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 40f32279..4250e4de 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-ggsn-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-ggsn-test" diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index fcb51b61..3d942de5 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-hlr-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-hlr-test" diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 4f836b7c..473782f2 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-mgw-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-mgw-test" diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 3289a671..a0a5f878 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-msc-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 7f57c096..fb6ccd30 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-pcu-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-pcu-test" diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index bee539d5..e78dca0e 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-pcu-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-pcu-test" diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index e4611bcf..79471321 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-sgsn-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-sgsn-test" diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index a9182698..02c7cd69 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-jessie-build" \ + "debian-stretch-build" \ "osmo-sip-$IMAGE_SUFFIX" \ "debian-stretch-titan" \ "ttcn3-sip-test"