X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=ad5d618ba375168d9de59f5e87d395259127329c;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=368149f91b9df49a2709cbeda4defbdfb33befa6;hpb=5be49421fe3c495635af4abe94e48c2eb069b75a;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 368149f91..ad5d618ba 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -34,20 +34,23 @@ - 'csit-docs-merge-{stream_timed}' - 'csit-docs-verify-{stream}' - 'csit-report-merge-{stream}' - - 'csit-report-merge-1801_2' - 'csit-trending-daily-master' - - 'csit-dpdk-perf-{stream}-{type}' + - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - 'csit-dpdk-perf-mrr-weekly-master' - - 'csit-ligato-perf-{stream}-{type}' - - 'csit-vpp-perf-{stream}-{type}' - - 'csit-vpp-perf-trend-daily-master' - - 'csit-vpp-perf-trend-semi-weekly-master' + - 'csit-dpdk-perf-mrr-weekly-master-2n-skx' + - 'csit-dpdk-perf-mrr-weekly-master-3n-skx' + - 'csit-ligato-perf-verify-{stream}-{topo}-{arch}' - 'csit-vpp-perf-mrr-daily-master' + - 'csit-vpp-perf-mrr-daily-master-2n-skx' + - 'csit-vpp-perf-mrr-daily-master-3n-skx' + - 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' + - 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' + - 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' - 'csit-vpp-perf-verify-{stream}-{topo}-{arch}' - 'csit-nsh_sfc-verify-perf-{stream}' - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' - 'csit-tldk-verify-func-{stream}-{os}-virl' - - 'csit-dmm-functional-{stream}-{os}-virl' + - 'csit-dmm-functional-{stream}-ubuntu1604-virl' project: 'csit' branch: 'master' @@ -63,18 +66,15 @@ - master: branch: 'master' branch-id: 'oper' - - '1707': - branch: 'rls1707' - branch-id: 'oper-rls1707' - - '1710': - branch: 'rls1710' - branch-id: 'oper-rls1710' - '1801': branch: 'rls1801' branch-id: 'oper-rls1801' - '1804': branch: 'rls1804' branch-id: 'oper-rls1804' + - '1807': + branch: 'rls1807' + branch-id: 'oper-rls1807' - job-template: @@ -84,7 +84,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -127,13 +127,47 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-dpdk-perf-{stream}-{type}' + name: 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' + + description: | + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -144,8 +178,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - type-parameter: - type: '{type}' scm: - gerrit-trigger-scm: @@ -158,14 +190,26 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-dpdk-{type}' + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'csit-dpdk-{topo}-{arch}-perftest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -181,67 +225,52 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-{stream}-{type}' - - project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' - concurrent: true - - 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}' - - type-parameter: - type: '{type}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-{type}' - - builders: - - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-hw.sh + name: 'csit-ligato-perf-verify-{stream}-{topo}-{arch}' - publishers: - - archive-artifacts: - artifacts: 'archive/*.*' - latest-only: false - - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'csit-ligato-perf-{stream}-{type}' + description: | + project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' + node: 'ubuntu1804-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -252,8 +281,9 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - type-parameter: - type: '{type}' + - gerrit-refspec-parameter + - gerrit-event-type-parameter + - gerrit-event-comment-text-parameter scm: - gerrit-trigger-scm: @@ -266,14 +296,26 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-ligato-{type}' + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'csit-ligato-{topo}-{arch}-perftest' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -297,7 +339,7 @@ node: '{os}-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -349,7 +391,7 @@ node: '{os}-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -399,7 +441,7 @@ node: centos7-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -453,7 +495,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -514,7 +556,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -591,7 +633,7 @@ node: 'ubuntu1604-basebuild-8c-32g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -658,80 +700,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' -- job-template: - name: 'csit-report-merge-1801_2' - - project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' - 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: 'rls1801_2' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-report' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/rls1801_2' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'csit-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'csit-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: include-raw-csit-report.sh - - publishers: - - archive: - artifacts: 'resources/tools/presentation/csit.report.tar.gz' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - job-template: name: 'csit-trending-daily-master' @@ -739,7 +707,7 @@ node: 'ubuntu1604-basebuild-8c-32g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -783,41 +751,50 @@ !include-raw-escape: include-raw-csit-cpta.sh publishers: + - email-ext: + recipients: 'tifrank@cisco.com, csit-report@lists.fd.io' + reply-to: '' + content-type: 'text' + subject: 'FD.io CSIT Trending Alert: Build # $BUILD_NUMBER' + attachments: '**/_build/_static/vpp/failed-tests*.tar.gz' + body: | + FD.io CSIT Trending Alert - failed tests + + $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS + + See attachment for the list of the failed tests. + + always: true + failure: false + - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-trend-daily-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw' description: | - Purpose of this job is to validate latest vpp build from corresponding - branch stored in nexus against verified CSIT codebase of corresponding - branch. - - objective - daily perf trending of vpp master build - job - name - csit-vpp-perf-trend-daily - trigger - scheduled daily - perf test-cases selection - all CSIT perf suites - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores - X520 - Intel x520-DA2 NIC - NDRDISC - discovery of NDR throughput - results - jjb verify - no - present - jenkins trending graphs - + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -833,12 +810,15 @@ - fdio-infra-wrappers-non-activity-timeout: build-timeout: '{build-timeout}' + triggers: + - timed: '0 0 * * 6' + 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-trend-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -854,39 +834,30 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-trend-semi-weekly-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx' description: | - Purpose of this job is to validate latest vpp build from corresponding - branch stored in nexus against verified CSIT codebase of corresponding - branch. - - consumer - csit-dev trending semi-weekly - objective - semi-weekly perf trending of vpp master build job - name - csit-vpp-perf-trend-semi-weekly - trigger - scheduled semi-weekly - perf test-cases selection - all CSIT perf suites - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores - X710 - Intel x710 Fortville NIC - XL710 - Intel xl710 Fortville NIC - NDRDISC - discovery of NDR throughput - results - jjb verify - no - present - jenkins trending graphs - + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -902,12 +873,15 @@ - fdio-infra-wrappers-non-activity-timeout: build-timeout: '{build-timeout}' + triggers: + - timed: '0 0 * * 6' + 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-trend-semi-weekly.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -923,33 +897,230 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-mrr-daily-master' + name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx' description: | - objective - check vpp perf mrr daily - job - name - csit-vpp-perf-mrr-daily - trigger - twice a day - perf test-cases selection - all CSIT MRR perf suites - results - jjb verify - PASS/FAIL - present - no - analyse - csit project - catch malfunctions - catch degradations + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + concurrent: false + + build-discarder: + 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-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 0 * * 6' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-perf-mrr-daily-master' + + description: | + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + concurrent: true + + build-discarder: + 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-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 2,16 * * *' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-perf-mrr-daily-master-2n-skx' + + description: | + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + concurrent: true + + build-discarder: + 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-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 2,16 * * *' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-vpp-perf-mrr-daily-master-3n-skx' + + description: | + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -973,7 +1144,7 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -996,30 +1167,96 @@ name: 'csit-dpdk-perf-mrr-weekly-master' description: | - objective - check dpdk perf mrr weekly - job - name - csit-dpdk-perf-mrr-weekly-master - trigger - weekly - perf test-cases selection - all CSIT DPDK MRR perf suites - results - jjb verify - PASS/FAIL - present - no - analyse - csit project - catch malfunctions - catch degradations + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + concurrent: false + + build-discarder: + 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-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 0 * * 6' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-dpdk-perf-mrr-weekly-master-2n-skx' + + description: | + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1043,7 +1280,7 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-mrr-weekly.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -1062,6 +1299,75 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'csit-dpdk-perf-mrr-weekly-master-3n-skx' + + description: | + + + project-type: freestyle + node: 'ubuntu1604-basebuild-4c-4g' + concurrent: false + + build-discarder: + 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-non-activity-timeout: + build-timeout: '{build-timeout}' + + triggers: + - timed: '0 0 * * 6' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot: + output-path: 'csit/archive' + other-files: + - '*.*' + + - trigger: + project: 'csit-trending-daily-master' + threshold: 'FAILURE' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + + - job-template: name: 'csit-vpp-perf-verify-{stream}-{topo}-{arch}' @@ -1103,11 +1409,12 @@
  • analyse: no + project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' - concurrent: false + node: 'ubuntu1604-basebuild-8c-32g' + concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1118,6 +1425,9 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - gerrit-refspec-parameter + - gerrit-event-type-parameter + - gerrit-event-comment-text-parameter scm: - gerrit-trigger-scm: @@ -1149,7 +1459,7 @@ builders: - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-verify.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -1171,7 +1481,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1225,7 +1535,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1279,7 +1589,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1325,13 +1635,13 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-dmm-functional-{stream}-{os}-virl' + name: 'csit-dmm-functional-{stream}-ubuntu1604-virl' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}'