Merge "Various fixes to the deb_dpkg build script"

[ci-management.git] / jjb / csit / csit.yaml

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index a084946..cb2a9e1 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -35,7 +35,7 @@
     name: 'csit-vpp-functional-{stream}-virl'
 
     project-type: freestyle
-    node: verify
+    node: verify-ubuntu1604
     concurrent: true
 
     logrotate:
@@ -57,7 +57,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
+       - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     triggers:
@@ -81,7 +81,7 @@
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: verify
+    node: verify-ubuntu1604
     concurrent: false
 
     logrotate:
@@ -105,11 +105,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: 1440
-##change build timeout behaviour to no-activity, 30 minutes
-        - build-no-activity-timeout:
-            build-timeout: 30
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: 30
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -268,7 +265,7 @@
     description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.'
 
     project-type: freestyle
-    node: verify
+    node: verify-ubuntu1604
     concurrent: false
 
     logrotate:
@@ -290,7 +287,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '480'
+            build-timeout: '600'
 
     triggers:
         - timed: '0 4 * * 0'
@@ -327,7 +324,7 @@
     description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
 
     project-type: freestyle
-    node: verify
+    node: verify-ubuntu1604
     concurrent: false
 
     logrotate:
@@ -374,7 +371,7 @@
     description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
 
     project-type: freestyle
-    node: verify
+    node: verify-ubuntu1604
     concurrent: false
 
     logrotate:
@@ -390,11 +387,8 @@
             branch: '{branch}'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '1440'
-##change build timeout behaviour to no-activity, 30 minutes
-        - build-no-activity-timeout:
-            build-timeout: '1440'
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '1440'
 
     triggers:
         - timed: '0 20 * * *'