X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=a0849463ab0a5b04a26372db83231e2ca8b39834;hb=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=f0e443f47dc8d410c53b5ffb2b173d4adcbe1eb9;hpb=1d83b0793708d7c5b0c1e13936fbf94ea5b6ee70;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index f0e443f47..a0849463a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -5,23 +5,31 @@ jobs: - 'csit-vpp-perf-{stream}-{type}' - 'csit-vpp-functional-{stream}-virl' - - 'csit-vpp-verify-master-weekly' - - 'csit-vpp-master-verify-semiweekly' + - 'csit-vpp-verify-{stream_timed}-weekly' + - 'csit-vpp-verify-{stream_timed}-semiweekly' + - 'csit-vpp-verify-perf-master-nightly-all' project: 'csit' branch: 'master' - branch-id: 'master' + branch-id: 'oper' build-artifact-num-to-keep: 10 type: - all - long + stream_timed: + - master: + branch: 'master' + branch-id: 'oper' stream: - master: branch: 'master' - branch-id: 'master' + branch-id: 'oper' - '1606': - branch: 'stable/1606' - branch-id: 'stable1606' + branch: 'rls1606' + branch-id: 'oper-rls1606' + - '1609': + branch: 'rls1609' + branch-id: 'oper-rls1609' - job-template: name: 'csit-vpp-functional-{stream}-virl' @@ -44,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: @@ -60,7 +67,7 @@ builders: - shell: - !include-raw-escape include-raw-csit-vpp-functional-virl.sh + !include-raw-escape: include-raw-csit-vpp-functional-virl.sh publishers: - archive-artifacts: @@ -93,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: @@ -110,7 +119,7 @@ builders: - shell: - !include-raw-escape jjb/csit/include-raw-csit-vpp-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-hw.sh publishers: - archive-artifacts: @@ -126,6 +135,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-1.csv' series: - file: 'output_perf_data.xml' format: xml @@ -136,6 +146,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-2.csv' series: - file: 'output_perf_data.xml' format: xml @@ -146,6 +157,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-3.csv' series: - file: 'output_perf_data.xml' format: xml @@ -156,6 +168,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-4.csv' series: - file: 'output_perf_data.xml' format: xml @@ -166,6 +179,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-5.csv' series: - file: 'output_perf_data.xml' format: xml @@ -176,6 +190,7 @@ group: 'RFC2544:NDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-6.csv' series: - file: 'output_perf_data.xml' format: xml @@ -186,6 +201,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-7.csv' series: - file: 'output_perf_data.xml' format: xml @@ -196,6 +212,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-8.csv' series: - file: 'output_perf_data.xml' format: xml @@ -206,6 +223,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-9.csv' series: - file: 'output_perf_data.xml' format: xml @@ -216,6 +234,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-10.csv' series: - file: 'output_perf_data.xml' format: xml @@ -226,6 +245,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-11.csv' series: - file: 'output_perf_data.xml' format: xml @@ -236,6 +256,7 @@ group: 'RFC2544:PDR' num-builds: '20' keep-records: True + csv-file-name: 'csit-vpp-perf-{stream}-{type}-12.csv' series: - file: 'output_perf_data.xml' format: xml @@ -243,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 @@ -264,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' @@ -282,8 +302,8 @@ builders: - shell: - !include-raw-escape jjb/csit/include-raw-csit-vpp-verify-weekly.sh - - shell: 'echo "DATE=`date +%Y-%m-%d`" > $WORKSPACE/variables.prop' + !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh + - shell: 'echo "DATE=`date +%y%m%d`" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop @@ -299,12 +319,12 @@ branches: - branch: remote: origin - name: 'refs/heads/csit-verified-{branch-id}-$DATE' + name: 'refs/heads/{branch-id}-$DATE' - job-template: - name: 'csit-vpp-master-verify-semiweekly' - description: 'Purpose of this job is to validate latest vpp build stored in nexus against verified CSIT codebase.' + 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 node: verify @@ -322,15 +342,9 @@ - gerrit-parameter: branch: '{branch}' - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - branch: 'master' - wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: 480 triggers: - timed: '0 4 * * 2,6' @@ -341,8 +355,11 @@ branch: '{branch}' builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop - shell: - !include-raw-escape jjb/csit/include-raw-csit-vpp-master-verify-semiweekly.sh + !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh publishers: - archive-artifacts: @@ -352,9 +369,187 @@ - robot-report: output-path: 'csit/archive' +- 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.' + + project-type: freestyle + node: verify + concurrent: false + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + 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' + + triggers: + - timed: '0 20 * * *' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-nightly.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - 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-master-nightly-1.csv' + series: + - file: 'csit/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-master-nightly-2.csv' + series: + - file: 'csit/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-master-nightly-3.csv' + series: + - file: 'csit/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-master-nightly-4.csv' + series: + - file: 'csit/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-master-nightly-5.csv' + series: + - file: 'csit/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-master-nightly-6.csv' + series: + - file: 'csit/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-master-nightly-7.csv' + series: + - file: 'csit/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-master-nightly-8.csv' + series: + - file: 'csit/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-master-nightly-9.csv' + series: + - file: 'csit/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-master-nightly-10.csv' + series: + - file: 'csit/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-master-nightly-11.csv' + series: + - file: 'csit/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-master-nightly-12.csv' + series: + - file: 'csit/output_perf_data.xml' + format: xml + xpath-type: 'nodeset' + xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]' + - parameter: name: test-type-parameter - parameters: - string: name: TYPE