Improve Karaf exec customization for tests

JIRA: TRNSPRTPCE-482
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I60f3010c13e9f101761a46b733982cc27df2c765

diff --git a/karaf/src/main/assembly/ressources/karaf_pre_launch.sh b/karaf/src/main/assembly/ressources/karaf_pre_launch.sh
index 98955b943e490baec3c3e11c7f1997db1d018ea4..4d1328d8f5de93c9b1c4651f0f32b24f1c730446 100755 (executable)
--- a/karaf/src/main/assembly/ressources/karaf_pre_launch.sh
+++ b/karaf/src/main/assembly/ressources/karaf_pre_launch.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-. $(dirname $0)/../../../../tests/reflectwarn.sh
-
-echo 'karaf exec tainted for tests'
-
 mkdir -p $(dirname $0)/../configuration/initial/
 if [ -z "$USE_ODL_ALT_RESTCONF_PORT" ]; then
     RESTCONF_PORT=8181
@@ -42,3 +38,4 @@ else
 fi
 sed -e "s/ODL_WEBSOCKET_PORT/$WEBSOCKET_PORT/" $(dirname $0)/../ressources/org.opendaylight.restconf._template.cfg  >$(dirname $0)/../etc/org.opendaylight.restconf.cfg
 
+touch $(dirname $0)/../ressources/karaf_configured

diff --git a/karaf/src/main/assembly/ressources/post_install_for_tests.sh b/karaf/src/main/assembly/ressources/post_install_for_tests.sh
index e4bd18119acaf22f693f2a92091558f509da3556..813d9c3f05933a67603da05200a1e5851b953f62 100755 (executable)
--- a/karaf/src/main/assembly/ressources/post_install_for_tests.sh
+++ b/karaf/src/main/assembly/ressources/post_install_for_tests.sh
@@ -9,7 +9,13 @@ sed 's/8101/ODL_SHELL_PORT/' ../etc/org.apache.karaf.shell.cfg > org.apache.kara
 sed -e 's/1099/ODL_RMI_REGISTRY_PORT/' -e 's/44444/ODL_RMI_SERVER_PORT/' ../etc/org.apache.karaf.management.cfg > org.apache.karaf.management._template.cfg
 sed 's/^[#|]websocket-port=8185/websocket-port=ODL_WEBSOCKET_PORT/' ../system/org/opendaylight/netconf/sal-rest-connector-config/[0-9.]*/sal-rest-connector-config-[0-9.]*-restconf.cfg >org.opendaylight.restconf._template.cfg
 
-cp ../bin/karaf  ../bin/karaf_
-cat karaf_pre_launch.sh ../bin/karaf_ > ../bin/karaf
-chmod +x  ../bin/karaf
-
+sed -i'_' -e '1 a\
+\
+. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\
+\
+if [ ! -f \$(dirname \$0)/\.\./ressources/karaf_configured ]; then\
+    \$(dirname \$0)/\.\./ressources/karaf_pre_launch.sh\
+fi\
+echo "karaf exec tainted for tests"\
+\
+' ../bin/karaf