X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=a0849463ab0a5b04a26372db83231e2ca8b39834;hb=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=10ee8ea537a4cb7a932cff38b15c851e90348f1f;hpb=21943e45bce231535dcaaf83f835213a4fd04824;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 10ee8ea53..a0849463a 100644
--- 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'
@@ -363,140 +369,6 @@
         - robot-report:
             output-path: 'csit/archive'
 
-        - plot:
-            - title: 'RFC2544 binary search with 64B, worker-thread=1, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-1.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=1, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-2.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=2, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-3.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=2, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-4.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=4, rxq=2, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-5.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=4, rxq=2, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-6.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=1, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-7.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=1, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-8.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=2, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-9.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=2, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-10.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=4, rxq=2, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-11.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=4, rxq=2, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-{stream}-semiweekly-12.csv'
-              series:
-                  - file: 'csit/archive/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
-
 - job-template:
     name: 'csit-vpp-verify-perf-master-nightly-all'
     description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
@@ -518,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 * * *'
@@ -548,7 +422,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-1.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="1"]'
@@ -559,7 +433,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-2.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="1"]'
@@ -570,7 +444,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-3.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="2"]'
@@ -581,7 +455,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-4.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="2"]'
@@ -592,7 +466,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-5.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="4"]'
@@ -603,7 +477,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-6.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="4"]'
@@ -614,7 +488,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-7.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="1"]'
@@ -625,7 +499,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-8.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="1"]'
@@ -636,7 +510,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-9.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="2"]'
@@ -647,7 +521,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-10.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="2"]'
@@ -658,7 +532,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-11.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="4"]'
@@ -669,7 +543,7 @@
               keep-records: True
               csv-file-name: 'csit-vpp-verify-master-nightly-12.csv'
               series:
-                  - file: 'csit/output.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'