osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/30768 )
Change subject: scripts/regen_doc: use SUBNET variable
......................................................................
scripts/regen_doc: use SUBNET variable
Add a $SUBNET parameter and use it throughout the script, similar to
other ttcn3-*/jenkins.sh scripts. This is in preparation for figuring
out a free network in network_create() automatically in a future patch.
Related: OS#5802
Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3
---
M scripts/regen_doc.sh
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/68/30768/1
diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh
index cd3c560..012c12a 100755
--- a/scripts/regen_doc.sh
+++ b/scripts/regen_doc.sh
@@ -21,7 +21,8 @@
docker_images_require \
"$NAME-$IMAGE_SUFFIX"
-network_create 16
+SUBNET=16
+network_create "$SUBNET"
container_create() {
CONTAINERNAME=$1
@@ -35,15 +36,21 @@
}
-container_create "$NAME-$IMAGE_SUFFIX" 172.18.16.23
+container_create "$NAME-$IMAGE_SUFFIX" "172.18.$SUBNET.23"
# Get asciidoc counter info
${OSMO_INTERACT_VTY} \
- -c "enable;show asciidoc counters" -p "$PORT" -H 172.18.16.23 -O
"$COUNTERFILE"
+ -c "enable;show asciidoc counters" \
+ -p "$PORT" \
+ -H "172.18.$SUBNET.23" \
+ -O "$COUNTERFILE"
# Get vty reference
${OSMO_INTERACT_VTY} \
- -X -p "$PORT" -H 172.18.16.23 -O "$VTYFILE"
+ -X \
+ -p "$PORT" \
+ -H "172.18.$SUBNET.23" \
+ -O "$VTYFILE"
docker container kill "${BUILD_TAG}-$NAME-$IMAGE_SUFFIX"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30768
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3
Gerrit-Change-Number: 30768
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
