Merge "Fix persistence when karaf is restarted"

[transportpce.git] / karaf / src / main / assembly / ressources / post_install_for_tests.sh

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 5adde6d3896ba20b4b7d4342742d6c1dc25b9878..40f3545d0d92314fcdd9b713e4787ed3d0abedba 100755 (executable)
--- a/karaf/src/main/assembly/ressources/post_install_for_tests.sh
+++ b/karaf/src/main/assembly/ressources/post_install_for_tests.sh
@@ -1,44 +1,22 @@
 #!/bin/sh
 
 cd $(dirname $0)
-sed -i'_' -e '1 a\
-\
-. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\
-mkdir -p \$(dirname \$0)/\.\./configuration/initial/\
-if [ -z "$USE_ODL_ALT_RESTCONF_PORT" ]; then\
-    RESTCONF_PORT=8181\
-else\
-    RESTCONF_PORT=$USE_ODL_ALT_RESTCONF_PORT\
-fi\
-sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" \$(dirname \$0)/\.\./ressources/org.ops4j.pax.web._template.cfg  >\$(dirname \$0)/\.\./etc/org.ops4j.pax.web.cfg\
-sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" \$(dirname \$0)/\.\./ressources/jetty_template.xml  >\$(dirname \$0)/\.\./etc/jetty.xml\
-if [ -z "$USE_ODL_ALT_AKKA_PORT" ]; then\
-    AKKA_PORT=2550\
-else\
-    AKKA_PORT=$USE_ODL_ALT_AKKA_PORT\
-fi\
-sed -e "s/ODL_AKKA_PORT/$AKKA_PORT/" \$(dirname \$0)/\.\./ressources/akka-default_template.conf  >\$(dirname \$0)/\.\./configuration/initial/akka.conf\
-if [ -z "$USE_ODL_ALT_SHELL_PORT" ]; then\
-    SHELL_PORT=8101\
-else\
-    SHELL_PORT=$USE_ODL_ALT_SHELL_PORT\
-fi\
-sed -e "s/ODL_SHELL_PORT/$SHELL_PORT/" \$(dirname \$0)/\.\./ressources/org.apache.karaf.shell._template.cfg  >\$(dirname \$0)/\.\./etc/org.apache.karaf.shell.cfg\
-if [ -z "$USE_ODL_ALT_RMI_REGISTRY_PORT" ]; then\
-    RMI_REGISTRY_PORT=1099\
-else\
-    RMI_REGISTRY_PORT=$USE_ODL_ALT_RMI_REGISTRY_PORT\
-fi\
-if [ -z "$USE_ODL_ALT_RMI_SERVER_PORT" ]; then\
-    RMI_SERVER_PORT=44444\
-else\
-    RMI_SERVER_PORT=$USE_ODL_ALT_RMI_SERVER_PORT\
-fi\
-sed -e "s/ODL_RMI_REGISTRY_PORT/$RMI_REGISTRY_PORT/" -e "s/ODL_RMI_SERVER_PORT/$RMI_SERVER_PORT/" \$(dirname \$0)/\.\./ressources/org.apache.karaf.management._template.cfg  >\$(dirname \$0)/\.\./etc/org.apache.karaf.management.cfg\
-' ../bin/karaf
 
 sed 's/2550/ODL_AKKA_PORT/' ../system/org/opendaylight/controller/sal-clustering-config/*/sal-clustering-config-*-akkaconf.xml >akka-default_template.conf
 sed 's/8181/ODL_RESTCONF_PORT/' ../etc/org.ops4j.pax.web.cfg > org.ops4j.pax.web._template.cfg
 sed 's/8181/ODL_RESTCONF_PORT/' ../etc/jetty.xml > jetty_template.xml
 sed 's/8101/ODL_SHELL_PORT/' ../etc/org.apache.karaf.shell.cfg > org.apache.karaf.shell._template.cfg
 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/^#persistent=true/persistent=false/' ../system/org/opendaylight/controller/sal-clustering-config/*/sal-clustering-config-*-datastore.cfg > ../etc/org.opendaylight.controller.cluster.datastore.cfg
+
+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