Merge "Do not use --merge in rebot command"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 5af2e07282fa73a1c5f180a1ef5db0f6b9cb1be8..297a6aa99fb08a429eb6566a7c0000a77d2a5f2f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -28,6 +28,7 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-data-change-counter,
         odl-netconf-topology
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 6d6190a2718b4607fe0a4cfda6de08c1f68cc814..765ffe8b1efb0e65f8053e6cca45ad088bd4e0ba 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -29,6 +29,7 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-data-change-counter,
         odl-netconf-topology
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index b87c972975b38eeef81fe0db1e4667df1015208c..8cf9a9682a5da815d717e6d60da8f66379f848dc 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -25,7 +25,10 @@
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-bgp'
+    install-features: >
+        odl-restconf,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index d09bd4ce5f8bb2e7f5796b37fa108c649468ef2a..a6ea709fe5933adab1fb944a9fe11f830c285e31 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -27,7 +27,8 @@
     # Features to install
     install-features: >
         odl-restconf-noauth,
-        odl-bgpcep-bgp
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example
 
     # Built timeout
     build-timeout: '1500'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index cf2a2bbeb1a3f7e04146f428bef1ac7e1f8d3955..9f062b5bc61f1aeeac8c8624ece1fae36478fffa 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -25,7 +25,11 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf-noauth,odl-bgpcep-bgp,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf-noauth,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
+        odl-netconf-clustered-topology
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 8065f60e34ca995c5571e420aed41fa168c55f05..0bfcf7fd6badc3ad8b98b2160450ff081d166499 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -31,7 +31,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -118,7 +118,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -233,7 +233,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -455,7 +455,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -542,7 +542,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -651,7 +651,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -762,7 +762,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -985,7 +985,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
     concurrent: true
 
     properties:
@@ -1182,7 +1182,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
     concurrent: true
 
     properties:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 997d326921e4cf202890b5e0498e9c221b7da484..da480d043578302c1e7eba7a3e78a2b1595a3de4 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -54,7 +54,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -89,7 +89,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -279,6 +279,19 @@
       - opendaylight-infra-wrappers:
           build-timeout: '1200'
 
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'multipatch-build:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
     builders:
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
@@ -325,7 +338,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:
@@ -357,7 +370,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
index 22e61a94ca19d5716df0170eeca10cdca1269bda..fd3d923d15f88e0c20796abd01df335acd0acae4 100644 (file)
--- a/jjb/integration/integration4-templates.yaml
+++ b/jjb/integration/integration4-templates.yaml
@@ -8,7 +8,7 @@
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-4g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index fde2a3dde4138f26bb04a33302c9c6a78d58738c..ea9e96b037df11cc2d050f20b864b76adadf276f 100644 (file)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -30,7 +30,12 @@ export EMAIL="sandbox@jenkins.opendaylight.org"
 export GIT_COMMITTER_NAME="Multipatch Job"
 
 # TODO: Is "patches" still the correct word?
-IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
+if [ -n "$GERRIT_EVENT_COMMENT_TEXT" ]; then
+    PATCHES=($(echo "$GERRIT_EVENT_COMMENT_TEXT" \
+        | grep 'multipatch-build:' | awk -F: '{print $2}'))
+else
+    IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
+fi
 
 # For each patch:
 # * Clone the project.