Merge "Forgot the comma in previous patch..."

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 99a6db416bef26a5a52f0115e94fbc188b479855..8adc89589a7b02b8ab234226c3a23e5fb449747c 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -114,6 +114,8 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            override-votes: true
+            gerrit-build-unstable-verified-value: +1
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e2f45d2cfc763fc5a43825798da2f91fbbc3b63a..9833f911e5b08aa9ca0791d382a13c428cba4cef 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -96,7 +96,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:
@@ -276,7 +276,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:
@@ -552,7 +552,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: '*karaf.log*'
         - email-notification:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ca791541e39adb70372cad857e088e7bc5a71b67..03bd2fbb0490a764b85255e6d7e9a3501d0ad4c9 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -257,7 +257,7 @@
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
             artifacts: 'karaf.log*'
         - email-notification:

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
new file mode 100644 (file)
index 0000000..5e759d0
--- /dev/null
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: nemo-csit-engine
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'nemo'
+
+    # The functionality under test
+    functionality: 'engine'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-nemo-engine-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},nemo-distribution-{stream}'