diff --git a/README.md b/README.md index 479e0452..925907ea 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,9 @@ each `jenkins.sh`: . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-bsc-test" ``` diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 36c79d54..7c628db1 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -3,10 +3,8 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-bsc-test" #Make sure NET_NAME doesn't clash with the AoIP BSC test diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 44badb5a..7db65d2c 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -3,11 +3,9 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-bsc-test" mkdir $VOL_BASE_DIR/bsc-tester diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 1df1a705..4057b444 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "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 83bd1657..4974a344 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -4,11 +4,9 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" # NOTE: there is no osmocom-bb-host-latest, hence always use master! docker_images_require \ - "debian-stretch-build" \ "osmo-bsc-$IMAGE_SUFFIX" \ "osmo-bts-$IMAGE_SUFFIX" \ "osmocom-bb-host-master" \ - "debian-stretch-titan" \ "ttcn3-bts-test" start_bsc() { diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index a69e6400..72c25e6b 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-ggsn-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-ggsn-test" mkdir $VOL_BASE_DIR/ggsn-tester diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 47ce5a99..74fe429a 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-hlr-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-hlr-test" network_create 172.18.10.0/24 diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 4ebd235a..3b6dd416 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-mgw-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-mgw-test" mkdir $VOL_BASE_DIR/mgw-tester diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 805151a1..e701b0d0 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -3,10 +3,8 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-msc-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-msc-test" network_create 172.18.1.0/24 diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 06403d34..edebd0be 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-pcu-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-pcu-test" network_create 172.18.14.0/24 diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 271f89f1..7942d1ad 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-pcu-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-pcu-test" network_create 172.18.13.0/24 diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 1c2682cb..c5f86928 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -3,7 +3,6 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-remsim-$IMAGE_SUFFIX" \ "ttcn3-remsim-test" diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 242e44ae..f802b2d4 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -4,9 +4,7 @@ IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" # Always require osmo-stp-master since is the only with sccp_demo_user installed docker_images_require \ - "debian-stretch-build" \ "osmo-stp-master" \ - "debian-stretch-titan" \ "ttcn3-sccp-test" mkdir $VOL_BASE_DIR/sccp-tester diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9db295a2..9b77abf5 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -3,10 +3,8 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ "osmo-sgsn-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-sgsn-test" network_create 172.18.8.0/24 diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 8a1977e0..702a6f5d 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-sip-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-sip-test" network_create 172.18.11.0/24 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index bc2d5af7..ba00f309 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -3,9 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "debian-stretch-build" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-stretch-titan" \ "ttcn3-stp-test" mkdir $VOL_BASE_DIR/stp-tester