Merge "No-activity timeout for csit-perf jobs"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 463d1e3..a084946 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -5,8 +5,8 @@
     jobs:
         - 'csit-vpp-perf-{stream}-{type}'
         - 'csit-vpp-functional-{stream}-virl'
-        - 'csit-vpp-verify-master-weekly'
-        - 'csit-vpp-verify-{stream}-semiweekly'
+        - 'csit-vpp-verify-{stream_timed}-weekly'
+        - 'csit-vpp-verify-{stream_timed}-semiweekly'
         - 'csit-vpp-verify-perf-master-nightly-all'
 
     project: 'csit'
@@ -16,6 +16,10 @@
     type:
         - all
         - long
+    stream_timed:
+        - master:
+            branch: 'master'
+            branch-id: 'oper'
     stream:
         - master:
             branch: 'master'
@@ -23,6 +27,9 @@
         - '1606':
             branch: 'rls1606'
             branch-id: 'oper-rls1606'
+        - '1609':
+            branch: 'rls1609'
+            branch-id: 'oper-rls1609'
 
 - job-template:
     name: 'csit-vpp-functional-{stream}-virl'
@@ -45,14 +52,13 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -94,14 +100,16 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: 1440
+##change build timeout behaviour to no-activity, 30 minutes
+        - build-no-activity-timeout:
+            build-timeout: 30
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -256,8 +264,8 @@
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
 
 - job-template:
-    name: 'csit-vpp-verify-master-weekly'
-    description: 'Purpose of this job is to validate CSIT code against verified vpp build and create csit-verified branch in case of success.'
+    name: 'csit-vpp-verify-{stream_timed}-weekly'
+    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
@@ -277,13 +285,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '480'
 
     triggers:
         - timed: '0 4 * * 0'
@@ -316,7 +323,7 @@
 
 
 - job-template:
-    name: 'csit-vpp-verify-{stream}-semiweekly'
+    name: 'csit-vpp-verify-{stream_timed}-semiweekly'
     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
@@ -336,9 +343,8 @@
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: 480
 
     triggers:
         - timed: '0 4 * * 2,6'
@@ -384,9 +390,11 @@
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - fdio-infra-wrappers:
+            build-timeout: '1440'
+##change build timeout behaviour to no-activity, 30 minutes
+        - build-no-activity-timeout:
+            build-timeout: '1440'
 
     triggers:
         - timed: '0 20 * * *'