December 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: jenkins-common: tweak echo messages

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > maybe we should define a shell function for doing the set -x / echo / set +x? that would have the same problem: + echo_without_set_x Creating network ttcn3-bts-test Creating network ttcn3-bts-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:03:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: scripts/regen_doc: use SUBNET variable

by laforge

Attention is currently required from: osmith, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30768 ) Change subject: scripts/regen_doc: use SUBNET variable ...................................................................... Patch Set 1: Code-Review+1 -- 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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:03:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30767 ) Change subject: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 Gerrit-Change-Number: 30767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:02:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: jenkins-common: tweak echo messages

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: maybe we should define a shell function for doing the set -x / echo / set +x? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:02:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3: don't block on same testsuite running

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30771 ) Change subject: jobs/ttcn3: don't block on same testsuite running ...................................................................... jobs/ttcn3: don't block on same testsuite running Don't block jobs if other jobs with the same testsuite are already running. This used to be necessary as we had subnets hardcoded per testsuite, and therefore couldn't run it twice on the same host (e.g. once against latest, once against nightly). Related: OS#5802 Depends: docker-playground I57152b08ef0f38e17e7019a8df032189b03f56cf Change-Id: I3159403e2ce2ec184ee48b4ff4f145e718e9b428 --- M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml 2 files changed, 0 insertions(+), 107 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/30771/1 diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index e378122..60072fa 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -8,13 +8,11 @@ disabled: false description: "" node: ttcn3 - blocking: "^{job-name}.*" wipe_workspace: false jobs: - "{job-name}" job-name: - ttcn3-ggsn-test-kernel-git: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" # Cache the linux source tree in the workspace of one node node: ttcn3-ggsn-test-kernel-git description: | diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index e59611c..3b1b89f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -13,8 +13,6 @@ TTCN3 Testsuite</a> for more information. timer: "@midnight" node: ttcn3 - # Block *-latest for all master jobs (without suffix) - blocking: "^{job-name}.*" wipe_workspace: true jobs: - "{job-name}" @@ -22,26 +20,20 @@ job-name: # debian nightly - order by time - nplab-m3ua-test: - blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * - nplab-sua-test: - blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * - ttcn3-ggsn-test: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - ttcn3-ggsn-test-kernel: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 10 04 * * * description: | Test osmo-ggsn master with the Debian kernel. - ttcn3-ggsn-test-kernel-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 20 04 * * * description: | Test osmo-ggsn latest with the Debian kernel. - ttcn3-ggsn-test-kernel-latest-net-next: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 25 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false @@ -51,7 +43,6 @@ <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> net-next.git</a>. - ttcn3-ggsn-test-kernel-latest-torvalds: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 30 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false @@ -61,101 +52,71 @@ <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> torvalds/linux.git</a>. - ttcn3-ggsn-test-ogs: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 35 04 * * * description: | Test open5gs-smfd + open5gs-upfd main. email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - ttcn3-msc-test: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 40 04 * * * - ttcn3-pcu-test: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - ttcn3-pcu-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - ttcn3-sgsn-test: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - ttcn3-bsc-test: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - ttcn3-mgw-test: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - ttcn3-hlr-test: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - ttcn3-bts-test: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - ttcn3-sip-test: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - ttcn3-bscnat-test: - blocking: "^(ttcn3|TTCN3-.*)-bscnat-test.*" timer: 00 08 * * * disabled: true - ttcn3-bsc-test-sccplite: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - ttcn3-remsim-test: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * - ttcn3-stp-test: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - ttcn3-sccp-test: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - ttcn3-smlc-test: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - ttcn3-gbproxy-test: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - ttcn3-gbproxy-test-fr: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc - ttcn3-cbc-test: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * - ttcn3-ns-test: - blocking: "^(ttcn3|TTCN3-.*)-ns-test.*" timer: 00 11 * * * - ttcn3-ns-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-sns.*" timer: 10 11 * * * - ttcn3-ns-test-fr: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-fr.*" timer: 20 11 * * * node: hdlc - ttcn3-ns-test-sgsn-sns: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-sgsn-sns.*" timer: 30 11 * * * - ttcn3-pcap-client-test: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 40 11 * * * - ttcn3-bsc-test-vamos: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 12 * * * - ttcn3-hnodeb-test: - blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" timer: 40 12 * * * - ttcn3-upf-test: - blocking: "^(ttcn3|TTCN3-.*)-upf-test.*" timer: 00 13 * * * - ttcn3-hnbgw-test: - blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * - ttcn3-fr-test: - blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" timer: 40 10 * * * node: hdlc - ttcn3-pgw-test: - blocking: "^(ttcn3|TTCN3-.*)-pgw-test.*" timer: 00 14 * * * description: | Test open5gs-smfd + open5gs-upfd PGW main. @@ -163,219 +124,153 @@ # debian latest stable - nplab-m3ua-test-latest: - blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * - nplab-sua-test-latest: - blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * - ttcn3-ggsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - ttcn3-msc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - ttcn3-pcu-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - ttcn3-pcu-test-sns-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - ttcn3-sgsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - ttcn3-bsc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - ttcn3-mgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - ttcn3-hlr-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - ttcn3-bts-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - ttcn3-sip-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - ttcn3-bscnat-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bscnat-test.*" timer: 00 08 * * * disabled: true - ttcn3-bsc-test-sccplite-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - ttcn3-remsim-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * - ttcn3-stp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - ttcn3-sccp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - ttcn3-smlc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - ttcn3-gbproxy-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - ttcn3-gbproxy-test-fr-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc - ttcn3-cbc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * - ttcn3-pcap-client-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 40 11 * * * - ttcn3-hnodeb-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" timer: 40 12 * * * - ttcn3-upf-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-upf-test.*" timer: 00 13 * * * disabled: true - ttcn3-hnbgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian) jobs # centos7 nightly - TTCN3-centos7-pcap-client-test: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 10 13 * * * # centos7 latest - TTCN3-centos7-pcap-client-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 40 13 * * * # centos8 nightly - TTCN3-centos-ggsn-test: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - TTCN3-centos-msc-test: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - TTCN3-centos-pcu-test: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - TTCN3-centos-pcu-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - TTCN3-centos-sgsn-test: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - TTCN3-centos-bsc-test: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - TTCN3-centos-mgw-test: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - TTCN3-centos-hlr-test: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - TTCN3-centos-bts-test: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - TTCN3-centos-sip-test: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - TTCN3-centos-bsc-test-sccplite: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - TTCN3-centos-remsim-test: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * disabled: true - TTCN3-centos-stp-test: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - TTCN3-centos-gbproxy-test: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - TTCN3-centos-cbc-test: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * # centos8 latest stable - TTCN3-centos-ggsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - TTCN3-centos-msc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - TTCN3-centos-pcu-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - TTCN3-centos-pcu-test-sns-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - TTCN3-centos-sgsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - TTCN3-centos-bsc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - TTCN3-centos-mgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - TTCN3-centos-hlr-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - TTCN3-centos-bts-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - TTCN3-centos-sip-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - TTCN3-centos-bsc-test-sccplite-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - TTCN3-centos-remsim-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * disabled: true - TTCN3-centos-stp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - TTCN3-centos-smlc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - TTCN3-centos-sccp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - TTCN3-centos-gbproxy-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - TTCN3-centos-cbc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * # centos8 2022q2 (SYS#6007) - TTCN3-centos-pcu-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 17 * * * - TTCN3-centos-pcu-test-sns-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 17 * * * - TTCN3-centos-bsc-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 17 * * * - TTCN3-centos-mgw-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 45 17 * * * - TTCN3-centos-bts-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 18 * * * - TTCN3-centos-smlc-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 15 18 * * * - TTCN3-centos-gbproxy-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 30 18 * * * - job-template: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3159403e2ce2ec184ee48b4ff4f145e718e9b428 Gerrit-Change-Number: 30771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*/jenkins*.sh: use $SUBNET everywhere

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30769 ) Change subject: ttcn3-*/jenkins*.sh: use $SUBNET everywhere ...................................................................... ttcn3-*/jenkins*.sh: use $SUBNET everywhere Use the SUBNET variable instead of hardcoding it in some places. Split commands across multiple lines while at it to improve readability. Related: OS#5802 Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh 7 files changed, 45 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/30769/1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index e686710..3f7f1ec 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$i -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.31.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $((i + 1234)) \ + 1 \ + >>/data/osmo-bts-omldummy-${i}.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index e402b33..6dac56a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -51,7 +51,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.12.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index c018046..2138169 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.2.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3438771..3f1f2f1 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -68,10 +68,12 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ - -R 172.18.9.20 -r 172.18.9.22 \ - --trx TRX1@172.18.9.20:5700/1 \ - --trx TRX2@172.18.9.20:5700/2 \ - --trx TRX3@172.18.9.20:5700/3 >>/data/fake_trx.out 2>&1" + -R 172.18.$SUBNET.20 \ + -r 172.18.$SUBNET.22 \ + --trx TRX1@172.18.$SUBNET.20:5700/1 \ + --trx TRX2@172.18.$SUBNET.20:5700/2 \ + --trx TRX3@172.18.$SUBNET.20:5700/3 \ + >>/data/fake_trx.out 2>&1" } start_trxcon() { @@ -84,7 +86,10 @@ --name ${BUILD_TAG}-trxcon -d \ $DOCKER_ARGS \ $REPO_USER/osmocom-bb-host-master \ - /bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1" + /bin/sh -c "trxcon \ + -i 172.18.$SUBNET.21 \ + -s /data/unix/osmocom_l2 \ + >>/data/trxcon.log 2>&1" } start_virtphy() { diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 4bd2480..dfcf403 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -32,7 +32,11 @@ --name ${BUILD_TAG}-pcu-sns -d \ $DOCKER_ARGS \ $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-pcu \ + -c /data/osmo-pcu.cfg \ + -i 172.18.$SUBNET.10 \ + >>/data/osmo-pcu.log 2>&1" echo Starting container with PCU testsuite docker run --rm \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 2a6a9d8..b9e74b4 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -30,7 +30,10 @@ --name ${BUILD_TAG}-bankd -d \ $DOCKER_ARGS \ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \ - /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1" + /bin/sh -c "pcscd; \ + osmo-remsim-bankd \ + -i 172.18.$SUBNET.10 \ + >/data/osmo-remsim-bankd.log 2>&1" } start_client() { diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index d1a9a11..3a3346a 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -28,7 +28,11 @@ --name ${BUILD_TAG}-stp -d \ $DOCKER_ARGS \ $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1" + /bin/sh -c "sccp_demo_user \ + -l 172.18.$SUBNET.200 \ + -r 172.18.$SUBNET.203 \ + -C /data/sccp_demo_user.cfg \ + >>/data/sccp_demo_user.log 2>&1" echo Starting container with SCCP testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f Gerrit-Change-Number: 30769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: network_create: find free subnet automatically

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30770 ) Change subject: network_create: find free subnet automatically ...................................................................... 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 --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M scripts/regen_doc.sh M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins-ogs.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-ns-test/jenkins-fr.sh M ttcn3-ns-test/jenkins-sgsn-sns.sh M ttcn3-ns-test/jenkins-sns.sh M ttcn3-ns-test/jenkins.sh M ttcn3-pcap-client-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pgw-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh M ttcn3-upf-test/jenkins.sh 37 files changed, 155 insertions(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/30770/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 3a30ea0..758c4d0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -195,8 +195,9 @@ docker network inspect $NET_NAME | grep Name | cut -d : -f2 | awk -F\" 'NR>1{print $2}' | xargs -rn1 docker kill } +# Create network and find a free subnet automatically. The global variable +# SUBNET gets set to the subnet number that has been used. network_create() { - NET=$1 if docker network ls | grep -q $NET_NAME; then set +x echo "Removing stale network and containers..." @@ -204,12 +205,33 @@ network_clean network_remove fi - SUB4="172.18.$NET.0/24" - SUB6="fd02:db8:$NET::/64" + + SUBNET="$PPID" + for i in $(seq 1 30); do + SUBNET="$(echo "($SUBNET + 1) % 256" | bc)" + SUB4="172.18.$SUBNET.0/24" + SUB6="fd02:db8:$SUBNET::/64" + set +x + echo "Creating network $NET_NAME, trying SUBNET=$SUBNET..." + set -x + if docker network create \ + --internal \ + --subnet "$SUB4" \ + --ipv6 \ + --subnet "$SUB6" \ + "$NET_NAME"; then + set +x + echo + echo "### Network $NET_NAME created (SUBNET=$SUBNET) ###" + echo + set -x + return + fi + done + set +x - echo "Creating network $NET_NAME" - set -x - docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME + echo "ERROR: failed to create docker network" + exit 1 } network_bridge_create() { @@ -241,8 +263,40 @@ docker network remove $NET_NAME } +network_replace_subnet_in_configs() { + set +x + + local i + local files="$(find \ + "$VOL_BASE_DIR" \ + -name '*.cfg' -o \ + -name '*.conf' -o \ + -name '*.sh' -o \ + -name '*.txt' -o \ + -name '*.yaml' \ + )" + + if [ -z "$files" ]; then + echo "ERROR: network_replace_subnet_in_configs:" \ + "no config files found!" + exit 1 + fi + + for i in $files; do + echo "Applying SUBNET=$SUBNET to: $i" + sed \ + -i \ + -E \ + -e "s/172\.18\.[0-9]{1,3}\./172.18.$SUBNET./g" \ + -e "s/fd02:db8:[0-9]{1,3}:/fd02:db8:$SUBNET:/g" \ + "$i" + done + + set -x +} + # Generates list of params to pass to "docker run" to configure IP addresses -# $1: SUBNET to use, same as passed to network_create() +# $1: SUBNET to use, same as set by network_create() # $2: Address suffix from SUBNET to apply to the container docker_network_params() { NET=$1 diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 87035f3..1b71671 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -18,8 +18,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=7 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with STP in background docker run --rm \ diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index 4be00c8..6ee52ee 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -18,8 +18,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=6 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with STP in background docker run --rm \ diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 85e6a69..cbfd921 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -72,8 +72,8 @@ set_clean_up_trap set -e -SUBNET=50 -network_create $SUBNET +network_create +network_replace_subnet_in_configs mkdir $VOL_BASE_DIR/ogt-slave cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/ diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh index 012c12a..27c3138 100755 --- a/scripts/regen_doc.sh +++ b/scripts/regen_doc.sh @@ -21,8 +21,7 @@ docker_images_require \ "$NAME-$IMAGE_SUFFIX" -SUBNET=16 -network_create "$SUBNET" +network_create container_create() { CONTAINERNAME=$1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 3f7f1ec..c859fd6 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -23,8 +23,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=31 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 6dac56a..2343b4a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -22,8 +22,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=12 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with BSC docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 2138169..149e0d1 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -23,8 +23,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=2 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index a63cdad..7837476 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -17,8 +17,8 @@ cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/ cp bscs.config $VOL_BASE_DIR/bscnat/ -SUBNET=15 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with BSCNAT docker run --rm \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3f1f2f1..691c753 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -121,8 +121,7 @@ $REPO_USER/ttcn3-bts-test } -SUBNET=9 -network_create $SUBNET +network_create mkdir $VOL_BASE_DIR/bts-tester-generic cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ @@ -162,6 +161,7 @@ mkdir $VOL_BASE_DIR/virtphy # 1) classic test suite with BSC for OML and trxcon+fake_trx +network_replace_subnet_in_configs start_bsc start_bts trx 1 start_fake_trx @@ -180,6 +180,7 @@ sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg fi +network_replace_subnet_in_configs start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg @@ -197,6 +198,7 @@ sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg fi +network_replace_subnet_in_configs start_bts trx 1 start_fake_trx start_trxcon @@ -213,6 +215,7 @@ fi # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts +network_replace_subnet_in_configs start_bsc start_bts trx 1 start_testsuite hopping diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 63bf3f9..e1958ef 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ -SUBNET=27 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with CBC docker run --rm \ diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 182f512..9122063 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -18,9 +18,6 @@ docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test } -SUBNET=26 -network_create $SUBNET - mkdir $VOL_BASE_DIR/fr-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/fr-tester @@ -33,6 +30,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with FRNET docker run \ `# --rm is done in clean_up()` \ 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 @@ 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 @@ 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 \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index f8fae0f..0ee7a5f 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=24 -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 @@ -24,6 +21,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with gbproxy docker run --rm \ $(docker_network_params $SUBNET 10) \ diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh index b6500f0..93cc33a 100755 --- a/ttcn3-ggsn-test/jenkins-ogs.sh +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -24,8 +24,8 @@ cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ -SUBNET=3 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with ggsn (smf+upf) in background docker run --cap-add=NET_ADMIN \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 0797f76..00995bf 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -23,8 +23,7 @@ mkdir $VOL_BASE_DIR/ggsn -SUBNET=3 -network_create $SUBNET +network_create # start container with ggsn in background GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" @@ -32,6 +31,7 @@ if [ "$KERNEL_TEST" = "1" ]; then cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs kernel_test_prepare \ "defconfig" \ @@ -50,6 +50,7 @@ OSMO_SUT_HOST="172.18.$SUBNET.200" else cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 317f141..66d102e 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=10 -network_create $SUBNET - mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ +network_create +network_replace_subnet_in_configs + echo Starting container with HLR docker run --rm \ $(docker_network_params $SUBNET 20) \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index fee2728..5a40e5b 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -19,8 +19,7 @@ $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log } -SUBNET=35 -network_create $SUBNET +network_create run_tests() { base_dir="$1" @@ -42,6 +41,8 @@ mkdir $base_dir/unix + network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index 358280d..21e72c0 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -20,8 +20,8 @@ mkdir $VOL_BASE_DIR/unix -SUBNET=33 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with HNodeB docker run --rm \ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 2dee534..7b31f6d 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -20,8 +20,8 @@ sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi -SUBNET=4 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with mgw in background docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index a8e6229..6a0f3d5 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -10,9 +10,6 @@ set_clean_up_trap set -e -SUBNET=20 -network_create $SUBNET - mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ @@ -27,6 +24,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index e2cc494..7a912f8 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -19,8 +19,8 @@ docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper } -SUBNET=5 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with nitb in background docker volume rm nitb-vol diff --git a/ttcn3-ns-test/jenkins-fr.sh b/ttcn3-ns-test/jenkins-fr.sh index e30f6f9..3b609ab 100755 --- a/ttcn3-ns-test/jenkins-fr.sh +++ b/ttcn3-ns-test/jenkins-fr.sh @@ -22,9 +22,6 @@ set_clean_up_trap set -e -SUBNET=30 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp fr/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -32,6 +29,9 @@ mkdir $VOL_BASE_DIR/ns cp fr/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ diff --git a/ttcn3-ns-test/jenkins-sgsn-sns.sh b/ttcn3-ns-test/jenkins-sgsn-sns.sh index 4f90421..712b38c 100755 --- a/ttcn3-ns-test/jenkins-sgsn-sns.sh +++ b/ttcn3-ns-test/jenkins-sgsn-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=32 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp sgsn-sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp sgsn-sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-ns-test/jenkins-sns.sh b/ttcn3-ns-test/jenkins-sns.sh index c2fd651..1ed983b 100755 --- a/ttcn3-ns-test/jenkins-sns.sh +++ b/ttcn3-ns-test/jenkins-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=29 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-ns-test/jenkins.sh b/ttcn3-ns-test/jenkins.sh index af0552c..755af51 100755 --- a/ttcn3-ns-test/jenkins.sh +++ b/ttcn3-ns-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=28 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcap-client-test/jenkins.sh b/ttcn3-pcap-client-test/jenkins.sh index 253b6c2..a5769a4 100755 --- a/ttcn3-pcap-client-test/jenkins.sh +++ b/ttcn3-pcap-client-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/pcap-client cp osmo-pcap-client.cfg $VOL_BASE_DIR/pcap-client/ -SUBNET=31 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with pcap-client docker run --rm \ diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index dfcf403..393e828 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=14 -network_create $SUBNET - mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 4c0455d..ee53bb7 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=13 -network_create $SUBNET - mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 2810899..a61584d 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -19,8 +19,8 @@ cp upfd.sh $VOL_BASE_DIR/pgw/ cp upfd-setup.sh $VOL_BASE_DIR/pgw/ -SUBNET=18 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with open5gs-nrfd in background docker run --rm \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index b9e74b4..a7325e7 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -62,8 +62,7 @@ $REPO_USER/ttcn3-remsim-test } -SUBNET=17 -network_create $SUBNET +network_create mkdir $VOL_BASE_DIR/remsim-tester @@ -76,23 +75,26 @@ # 1) server test suite -start_server cp REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_server start_testsuite docker container kill ${BUILD_TAG}-server # 2) bankd test suite echo "Changing to bankd configuration" -start_bankd cp bankd/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_bankd start_testsuite docker container kill ${BUILD_TAG}-bankd # 3) client test suite echo "Changing to client configuration" -start_client cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_client start_testsuite diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 3a3346a..7eadd5d 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -17,8 +17,8 @@ mkdir $VOL_BASE_DIR/sccp cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ -SUBNET=22 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with sccp_demo_user docker run --rm \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index dde90a2..9238096 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -10,9 +10,6 @@ set_clean_up_trap set -e -SUBNET=8 -network_create $SUBNET - mkdir $VOL_BASE_DIR/sgsn-tester cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg" @@ -25,6 +22,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 334f791..2a20dcc 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=11 -network_create $SUBNET - mkdir $VOL_BASE_DIR/sip-tester mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-sip-connector docker run --rm \ $(docker_network_params $SUBNET 10) \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 8aeed92..33a1293 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -20,8 +20,8 @@ mkdir $VOL_BASE_DIR/smlc cp osmo-smlc.cfg $VOL_BASE_DIR/smlc/ -SUBNET=23 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 23434f3..006bb3b 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=19 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index 2fb6d43..f814975 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/upf cp osmo-upf.cfg $VOL_BASE_DIR/upf/ -SUBNET=34 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with UPF docker run --rm \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I57152b08ef0f38e17e7019a8df032189b03f56cf Gerrit-Change-Number: 30770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30767 ) Change subject: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR ...................................................................... ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR Prepare for a future patch where a free subnet will be figured out automatically instead of having a hardcoded one, by moving initrd-ggsn.sh to $VOL_BASE_DIR as the subnet will be replaced in files in this directory. Related: OS#5802 Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/30767/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c8968ad..0797f76 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -31,11 +31,12 @@ GGSN_DOCKER_ARGS="" if [ "$KERNEL_TEST" = "1" ]; then cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg + cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ kernel_test_prepare \ "defconfig" \ "fragment.config" \ - "initrd-ggsn.sh" \ + "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ -v $VOL_BASE_DIR/ggsn:/data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 Gerrit-Change-Number: 30767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: scripts/regen_doc: use SUBNET variable

by osmith

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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: jenkins-common: tweak echo messages

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... jenkins-common: tweak echo messages Use 'set +x' before echo, so messages are not printed twice and the output becomes more readable. Example: + echo Creating network ttcn3-bts-test Creating network ttcn3-bts-test Related: OS#5802 Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd --- M jenkins-common.sh 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/30766/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 33b1a67..3a30ea0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -168,7 +168,9 @@ pull_arg="" fi + set +x echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" + set -x make -C "${IMAGE_DIR_PREFIX}/${dir}" \ BUILD_ARGS="$pull_arg" \ UPSTREAM_DISTRO="$upstream_distro_arg" \ @@ -179,6 +181,7 @@ # Detect missing images (build skipped) if ! docker_image_exists "$i"; then + set +x echo "ERROR: missing image: $i" exit 1 fi @@ -195,26 +198,34 @@ network_create() { NET=$1 if docker network ls | grep -q $NET_NAME; then - echo removing stale network and containers... + set +x + echo "Removing stale network and containers..." + set -x network_clean network_remove fi SUB4="172.18.$NET.0/24" SUB6="fd02:db8:$NET::/64" - echo Creating network $NET_NAME + set +x + echo "Creating network $NET_NAME" + set -x docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME } network_bridge_create() { NET=$1 if docker network ls | grep -q $NET_NAME; then - echo removing stale network and containers... + set +x + echo "Removing stale network and containers..." + set -x network_clean network_remove fi SUB4="172.18.$NET.0/24" SUB6="fd02:db8:$NET::/64" - echo Creating network $NET_NAME + set +x + echo "Creating network $NET_NAME" + set -x docker network create \ --driver=bridge \ --subnet $SUB4 \ @@ -224,7 +235,9 @@ } network_remove() { - echo Removing network $NET_NAME + set +x + echo "Removing network $NET_NAME" + set -x docker network remove $NET_NAME } @@ -238,7 +251,9 @@ } fix_perms() { - echo Fixing permissions + set +x + echo "Fixing permissions" + set -x docker run --rm \ -v $VOL_BASE_DIR:/data \ -v $CACHE_DIR:/cache \ @@ -360,6 +375,7 @@ done # Let clean_up_common kill the VM + set +x echo "Timeout while waiting for kernel test VM" exit 1 } @@ -437,6 +453,7 @@ fi if [ ! -d "$VOL_BASE_DIR" ]; then + set +x echo "ERROR: \$VOL_BASE_DIR does not exist: '$VOL_BASE_DIR'" exit 1 fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022