Update automated project templates

Change-Id: I2bd2e9cfd9505676bb7120f08c2dae86db0c6109
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 4f412c39748ea86011416b22cc68be88bf9d6e27..70bbb6e5186e34d7cba65c18a11fec064c07eace 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,12 +225,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index d7442b44dd2a3181bdfb9cff4ae7ec4000c62de9..e16f438b0163851ee9534582dfe8a77e038eda0d 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,18 +225,19 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
         - reverse:
-            jobs: 'yangtools-merge,aaa-merge'
+            jobs: 'yangtools-merge-{stream},aaa-merge-{stream}'
             result: 'success'
 
     maven:

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 2bc3be0739fd950ddc233b6fe1524810f282e36b..c7016eb3a38d0da24a8e9d44b5de5a573d29be57 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,12 +225,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 2d86f836816b7fa1075bf4da78704f36d47e306a..e3ce0fe4d8e96cb61c9a875676b37533fe47523c 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,12 +225,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 8867c676327483221be3688025bc74e7680216de..a5f70dad17ffd44ee9080680764bb539f53d3350 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,18 +225,19 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
         - reverse:
-            jobs: 'yangtools-merge,controller-merge,openflowjava-merge'
+            jobs: 'yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
             result: 'success'
 
     maven:

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index d68694bfdfe62cebfa79dd86ca704dbcd1109cb7..0c3a08b6a1f345590b2a710b8631c4794b984838 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,18 +225,19 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
         - reverse:
-            jobs: 'yangtools-merge,controller-merge'
+            jobs: 'yangtools-merge-{stream},controller-merge-{stream}'
             result: 'success'
 
     maven:

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 8939655fcb1ef6b953fc1871417dfa67cc9c04d4..812aaf9f320ddaec231559420d23a61848de852b 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,12 +225,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 85056f49f1be8078ce35136e89b908303cfd99af..74c88b0d2f9b7a3d48e8931750db6a401b72ef22 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -61,6 +61,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +116,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +174,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -222,12 +225,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'