Merge "Run new MDSAL CSIT to the weekly MRI test"

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index e632895d3071b7e5e1ba786bcbe0733a8909534b..4a8af4c063519006f1b9367d453a800731286b53 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -74,6 +74,17 @@
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
+- project:
+    name: aaa-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: aaa
+    project-name: aaa
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: aaa-settings
+
 - project:
     name: aaa-sonar
     jobs:

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 7fbecb265627f9cfe681312e04b7ab21b1d8fe02..b29b2ca566fd04bc54787192daea69e9e7f79313 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -32,4 +32,4 @@
       odl-clustering-test-app
 
     # Robot custom options
-    robot-options: "-v DNB_CHECK_PERIOD:15s"
+    robot-options: ""