diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-11-28 20:52:13 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-11-28 20:58:27 +0100 |
| commit | 65712d64e54003ce631934b2d95117292fbe3a03 (patch) | |
| tree | 976b5649592cdef7f4257e42c32f24936ab54c7b /ttcn3-sip-test | |
| parent | c3f157b939784f19f0337ac92ac727063c8d3452 (diff) | |
for sip-latest tests, use MNCC version 5
osmo-sip-connector master and the ttcn3 tests have moved to protocol version 6.
While the extension is gracefully handled by the ttcn templates to make do with
both protocol versions, the actual protocol version number sent to
osmo-sip-connector breaks the tests if it doesn't match. So that master can
still run v6 yet also pass 'latest', configure v5 when the version is not
'master'.
When 'latest' also moves to v6, we of course can revert this again.
Related: Iaca9ed6611fc5ca8ca749bbbefc31f54bea5e925 (osmo-sip-connector)
Related: I39d55432776926a385e1b85b21bcdea8180a8946 (osmo-ttcn3-hacks)
Change-Id: I2174e90bdea32f06cd3e8298696b93027e7906bc
Diffstat (limited to 'ttcn3-sip-test')
| -rw-r--r-- | ttcn3-sip-test/SIP_Tests.cfg | 1 | ||||
| -rwxr-xr-x | ttcn3-sip-test/jenkins.sh | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ttcn3-sip-test/SIP_Tests.cfg b/ttcn3-sip-test/SIP_Tests.cfg index 2904e76..1ced5c3 100644 --- a/ttcn3-sip-test/SIP_Tests.cfg +++ b/ttcn3-sip-test/SIP_Tests.cfg @@ -13,6 +13,7 @@ SIP_Tests.mp_local_host := "172.18.11.103" SIP_Tests.mp_osmosip_host := "172.18.11.10" SIP_Tests.mp_mncc := "/data/unix/mncc" +MNCC_Emulation.mp_mncc_version := 6 [MAIN_CONTROLLER] diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 0bc0357..3d7d523 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -14,6 +14,10 @@ mkdir $VOL_BASE_DIR/sip-tester mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ +if [ "x${IMAGE_SUFFIX}" != "xmaster" ]; then + sed -i 's/mp_mncc_version := [0-9]*/mp_mncc_version:= 5/' "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ |