From f997b4e7712b65175deaf5ab13df0f568ae6f091 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 21 Dec 2022 19:05:32 +0100 Subject: network_create: find free subnet automatically Try multiple subnet numbers until successfully creating a network. This way we can run the same ttcn3 testsuite multiple times in parallel without conflicts (e.g. once against latest, once against nightly). Also we don't need to make sure each new testsuite has a unique subnet number anymore. I've considered also adjusting network_bridge_create, but that gets used exclusively by osmo-ran/jenkins.sh, a script which we don't actually run in jenkins. It seems that in this script it makes more sense to not get a random subnet number. Related: OS#5802 Change-Id: I57152b08ef0f38e17e7019a8df032189b03f56cf --- ttcn3-gbproxy-test-fr/jenkins.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ttcn3-gbproxy-test-fr') diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index f4827a8..ab62bc1 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -22,9 +22,6 @@ docker_images_require \ set_clean_up_trap set -e -SUBNET=25 -network_create $SUBNET - mkdir $VOL_BASE_DIR/gbproxy-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/gbproxy-tester @@ -36,6 +33,9 @@ cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with gbproxy docker run --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ -- cgit v1.2.3