Merge "Don't use NotificationListener (Servicehandler)"

diff --git a/features/pom.xml b/features/pom.xml
index 3b7e5ddc1e49f91216d326573092c0e96071b2e3..74f6636f234c701564e4ac90a83b7664deebc376 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -31,4 +31,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <module>odl-transportpce-dmaap-client</module>
     <module>odl-transportpce-swagger</module>
   </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/tests/build_controller.sh b/tests/build_controller.sh
index d250dcf1cae94ca0f885a7ac31e99a326cb144a4..00a8fe28b88b5576555ba92f80eb15cca00d9088 100755 (executable)
--- a/tests/build_controller.sh
+++ b/tests/build_controller.sh
@@ -19,7 +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
+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

diff --git a/tests/transportpce_tests/pce/test01_pce.py b/tests/transportpce_tests/pce/test01_pce.py
index 32886a613376970a88e7b4217570e4db301c70d0..a1b1b94839fc55e1480a02202ac45ff78b1d2438 100644 (file)
--- a/tests/transportpce_tests/pce/test01_pce.py
+++ b/tests/transportpce_tests/pce/test01_pce.py
@@ -55,6 +55,7 @@ class TransportPCEtesting(unittest.TestCase):
     def setUpClass(cls):
         # pylint: disable=bare-except
         sample_files_parsed = False
+        time.sleep(10)
         try:
             TOPO_BI_DIR_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                             "..", "..", "sample_configs", "honeynode-topo.json")