ttcn3-*-test: remove implicit dependencies
Don't list debian-stretch-build and debian-stretch-titan as dependencies anymore, now that docker_images_require finds them automatically. Related: OS#4564 Change-Id: I3cb6b693f3dd9df84fb29c0217bb3dae454cc18f
This commit is contained in:
parent
061efaf6e6
commit
5505b95a15
|
@ -50,11 +50,9 @@ each `jenkins.sh`:
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"osmo-bsc-$IMAGE_SUFFIX" \
|
"osmo-bsc-$IMAGE_SUFFIX" \
|
||||||
"osmo-bts-$IMAGE_SUFFIX" \
|
"osmo-bts-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-bsc-test"
|
"ttcn3-bsc-test"
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,8 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-bsc-$IMAGE_SUFFIX" \
|
"osmo-bsc-$IMAGE_SUFFIX" \
|
||||||
"osmo-bts-$IMAGE_SUFFIX" \
|
"osmo-bts-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-bsc-test"
|
"ttcn3-bsc-test"
|
||||||
|
|
||||||
#Make sure NET_NAME doesn't clash with the AoIP BSC test
|
#Make sure NET_NAME doesn't clash with the AoIP BSC test
|
||||||
|
|
|
@ -3,11 +3,9 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"osmo-bsc-$IMAGE_SUFFIX" \
|
"osmo-bsc-$IMAGE_SUFFIX" \
|
||||||
"osmo-bts-$IMAGE_SUFFIX" \
|
"osmo-bts-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-bsc-test"
|
"ttcn3-bsc-test"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/bsc-tester
|
mkdir $VOL_BASE_DIR/bsc-tester
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-nitb-$IMAGE_SUFFIX" \
|
"osmo-nitb-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-bscnat-test"
|
"ttcn3-bscnat-test"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,11 +4,9 @@
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
# NOTE: there is no osmocom-bb-host-latest, hence always use master!
|
# NOTE: there is no osmocom-bb-host-latest, hence always use master!
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-bsc-$IMAGE_SUFFIX" \
|
"osmo-bsc-$IMAGE_SUFFIX" \
|
||||||
"osmo-bts-$IMAGE_SUFFIX" \
|
"osmo-bts-$IMAGE_SUFFIX" \
|
||||||
"osmocom-bb-host-master" \
|
"osmocom-bb-host-master" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-bts-test"
|
"ttcn3-bts-test"
|
||||||
|
|
||||||
start_bsc() {
|
start_bsc() {
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-ggsn-$IMAGE_SUFFIX" \
|
"osmo-ggsn-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-ggsn-test"
|
"ttcn3-ggsn-test"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/ggsn-tester
|
mkdir $VOL_BASE_DIR/ggsn-tester
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-hlr-$IMAGE_SUFFIX" \
|
"osmo-hlr-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-hlr-test"
|
"ttcn3-hlr-test"
|
||||||
|
|
||||||
network_create 172.18.10.0/24
|
network_create 172.18.10.0/24
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-mgw-$IMAGE_SUFFIX" \
|
"osmo-mgw-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-mgw-test"
|
"ttcn3-mgw-test"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/mgw-tester
|
mkdir $VOL_BASE_DIR/mgw-tester
|
||||||
|
|
|
@ -3,10 +3,8 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"osmo-msc-$IMAGE_SUFFIX" \
|
"osmo-msc-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-msc-test"
|
"ttcn3-msc-test"
|
||||||
|
|
||||||
network_create 172.18.1.0/24
|
network_create 172.18.1.0/24
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-pcu-$IMAGE_SUFFIX" \
|
"osmo-pcu-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-pcu-test"
|
"ttcn3-pcu-test"
|
||||||
|
|
||||||
network_create 172.18.14.0/24
|
network_create 172.18.14.0/24
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-pcu-$IMAGE_SUFFIX" \
|
"osmo-pcu-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-pcu-test"
|
"ttcn3-pcu-test"
|
||||||
|
|
||||||
network_create 172.18.13.0/24
|
network_create 172.18.13.0/24
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-remsim-$IMAGE_SUFFIX" \
|
"osmo-remsim-$IMAGE_SUFFIX" \
|
||||||
"ttcn3-remsim-test"
|
"ttcn3-remsim-test"
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,7 @@
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
# Always require osmo-stp-master since is the only with sccp_demo_user installed
|
# Always require osmo-stp-master since is the only with sccp_demo_user installed
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-master" \
|
"osmo-stp-master" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-sccp-test"
|
"ttcn3-sccp-test"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/sccp-tester
|
mkdir $VOL_BASE_DIR/sccp-tester
|
||||||
|
|
|
@ -3,10 +3,8 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"osmo-sgsn-$IMAGE_SUFFIX" \
|
"osmo-sgsn-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-sgsn-test"
|
"ttcn3-sgsn-test"
|
||||||
|
|
||||||
network_create 172.18.8.0/24
|
network_create 172.18.8.0/24
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-sip-$IMAGE_SUFFIX" \
|
"osmo-sip-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-sip-test"
|
"ttcn3-sip-test"
|
||||||
|
|
||||||
network_create 172.18.11.0/24
|
network_create 172.18.11.0/24
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
. ../jenkins-common.sh
|
. ../jenkins-common.sh
|
||||||
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
|
||||||
docker_images_require \
|
docker_images_require \
|
||||||
"debian-stretch-build" \
|
|
||||||
"osmo-stp-$IMAGE_SUFFIX" \
|
"osmo-stp-$IMAGE_SUFFIX" \
|
||||||
"debian-stretch-titan" \
|
|
||||||
"ttcn3-stp-test"
|
"ttcn3-stp-test"
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/stp-tester
|
mkdir $VOL_BASE_DIR/stp-tester
|
||||||
|
|
Loading…
Reference in New Issue