pespin submitted this change.

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

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(-)

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 change 29432. To unsubscribe, or for help writing mail filters, visit settings.