Consolidate CSIT wrappers into inttest-csit-common

The same wrapper configuration is used by all templates so consolidate
it into the anchor for easier maintenance.

Change-Id: Ice7dd93bb9ec450fccc3ec140dead31770d6c570
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c02b92d961366d1ab611d52f508afe6e71455e49..694bd47d25232d00b84cc174749415b0009e0fbb 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -40,6 +40,7 @@
     #####################
 
     build-days-to-keep: 30
+    build-timeout: 360  # Time in minutes
     disable-job: false
 
     #####################
@@ -55,6 +56,9 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
 #################
 # Job Templates #
@@ -106,10 +110,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - integration-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
@@ -221,10 +221,6 @@
       - integration-csit-trigger:
           jobs: '{trigger-jobs}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
       - integration-infra-stack:
@@ -515,10 +511,6 @@
           refspec: '$GERRIT_REFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - integration-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
@@ -631,10 +623,6 @@
       - integration-csit-trigger:
           jobs: '{trigger-jobs}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
       - integration-infra-stack:
@@ -926,10 +914,6 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
       - integration-infra-stack:
@@ -1170,10 +1154,6 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'
 
@@ -1568,10 +1548,6 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'
 
@@ -1827,10 +1803,6 @@
       - integration-distribution-scm:
           branch: '{branch}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
@@ -1990,10 +1962,6 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'