pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29431 )
Change subject: ttcn3-hnbgw: Set different junit xml file name prefix for with-pfcp variant
......................................................................
ttcn3-hnbgw: Set different junit xml file name prefix for with-pfcp variant
Similar to what's done in BTS_Tests and REMSIM_Tests
Change-Id: Iee69774ae8885ab216d0d707ee5fd0269a438c83
---
M ttcn3-hnbgw-test/jenkins.sh
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 83cca1f..10bb428 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -77,4 +77,4 @@
run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
# Make jenkins results show ':with-pfcp': append ':with-pfcp' to the jenkins results classnames
sed -i "s/classname='\([^']\+\)'/classname='\1:with-pfcp'/g" \
- $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-*.log
+ $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index d3ea553..96609c2 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -7,6 +7,7 @@
# Local configuration below
[LOGGING]
+*.JUnitLogger.filename_stem := "junit-xml-with-pfcp"
[TESTPORT_PARAMETERS]
*.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29431
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iee69774ae8885ab216d0d707ee5fd0269a438c83
Gerrit-Change-Number: 29431
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29432 )
Change subject: ttcn3-hnbgw: sed junit file in the clean_up trap
......................................................................
ttcn3-hnbgw: sed junit file in the clean_up trap
Same as done in BTS_Tests. This makes sure the files are always properly
updated even if something goes wrong (such as docker kill failing to
stop hnbgw because it exited earlier due to unsupported feature).
Change-Id: Iac3bd9cf3448e18930dcef6c9ae4b6530939ffe6
---
M ttcn3-hnbgw-test/jenkins.sh
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 10bb428..8c1ddf5 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -10,6 +10,15 @@
set_clean_up_trap
set -e
+VOL_BASE_DIR_PFCP="$VOL_BASE_DIR/with-pfcp"
+clean_up() {
+ # append ':with-pfcp' to the classnames,
+ # e.g. "classname='HNBGW_Tests'" => "classname='HNBGW_Tests:with-pfcp'"
+ # so the with-pfcp test cases would not interfere without pfcp ones in Jenkins
+ sed -i "s/classname='\([^']\+\)'/classname='\1:with-pfcp'/g" \
+ $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log
+}
+
SUBNET=35
network_create $SUBNET
@@ -72,9 +81,5 @@
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
echo Testing with PFCP
-VOL_BASE_DIR_PFCP="$VOL_BASE_DIR/with-pfcp"
mkdir "$VOL_BASE_DIR_PFCP"
run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
-# Make jenkins results show ':with-pfcp': append ':with-pfcp' to the jenkins results classnames
-sed -i "s/classname='\([^']\+\)'/classname='\1:with-pfcp'/g" \
- $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29432
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iac3bd9cf3448e18930dcef6c9ae4b6530939ffe6
Gerrit-Change-Number: 29432
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged