Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not instantiate JsonParser
[transportpce.git]
/
tests
/
build_controller.sh
diff --git
a/tests/build_controller.sh
b/tests/build_controller.sh
index b261d951b2516d82b0f3d1996cf552396af3fe30..d250dcf1cae94ca0f885a7ac31e99a326cb144a4 100755
(executable)
--- a/
tests/build_controller.sh
+++ b/
tests/build_controller.sh
@@
-10,10
+10,8
@@
cd $(dirname $0)
which mvn >/dev/null || ./installMavenCentOS.sh
cd ../
which mvn >/dev/null || ./installMavenCentOS.sh
cd ../
-#patch OLM constant to speed up tests, unnecessary for PCE tests
-sed -i'_' 's@=.*//#FUNCTESTVAL=@=@g' olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
if [ "$USE_LIGHTY" != "True" ]; then
if [ "$USE_LIGHTY" != "True" ]; then
- for suffix in 121 221 71; do
+ for suffix in 121 221 71
_hybrid
; do
rm -rf "karaf$suffix"
cp -r karaf "karaf$suffix"
done
rm -rf "karaf$suffix"
cp -r karaf "karaf$suffix"
done
@@
-23,8
+21,6
@@
fi
. "$current_dir"/reflectwarn.sh
mvn clean install -B -q -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip
. "$current_dir"/reflectwarn.sh
mvn clean install -B -q -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip
-mv olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java_ olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
-
#patch Karaf exec for the same reason at runtime and also to have the possibility to use alternative ports
./karaf/target/assembly/ressources/post_install_for_tests.sh
#patch Karaf exec for the same reason at runtime and also to have the possibility to use alternative ports
./karaf/target/assembly/ressources/post_install_for_tests.sh