X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fbuild_controller.sh;h=00a8fe28b88b5576555ba92f80eb15cca00d9088;hb=e36b6989280be0cf36416ed1b32e583aaf226994;hp=b261d951b2516d82b0f3d1996cf552396af3fe30;hpb=980555a7d2dc492570012d813e5fa14253597233;p=transportpce.git diff --git a/tests/build_controller.sh b/tests/build_controller.sh index b261d951b..00a8fe28b 100755 --- a/tests/build_controller.sh +++ b/tests/build_controller.sh @@ -10,10 +10,8 @@ cd $(dirname $0) 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 - 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 @@ -21,9 +19,7 @@ fi #build controller, source JDK_JAVA_OPTIONS to remove illegal reflective acces warnings introduced by Java11 . "$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 +mvn clean install -B -q -s tests/odl_settings.xml -Pq #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