X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=42f159c4c9935f7e569cc60af4176491c77a9a7f;hb=95a8c42349da54996cdc2c747d5d52b0ffed2e0d;hp=2b497d566a85073a4c2b66c2fa6779626ad61346;hpb=ce3e3b893f2422d6c79c9ee7e4b3b45374fd6455;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 2b497d566..42f159c4c 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -18,6 +18,14 @@ os: - 'ubuntu1604' - 'centos7' + topo: + - '2n' + - '3n' + + arch: + - 'skx' + - 'hsw' + - 'arm' jobs: - 'csit-vpp-functional-{stream}-{os}-virl' @@ -28,19 +36,20 @@ - '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-vpp-perf-check-{stream}' - 'csit-vpp-perf-mrr-daily-master' - - 'csit-vpp-perf-verify-{stream}' + - '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' @@ -56,18 +65,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: @@ -120,64 +126,44 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-dpdk-perf-{stream}-{type}' - - project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' - 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-dpdk-{type}' - - builders: - - shell: - !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh - - publishers: - - archive-artifacts: - artifacts: 'archive/*.*' - latest-only: false + name: 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - - robot: - output-path: archive - other-files: - - '*.*' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'csit-vpp-perf-{stream}-{type}' + description: | + project-type: freestyle - node: 'ubuntu1604-basebuild-8c-32g' + node: 'ubuntu1604-basebuild-4c-4g' concurrent: true logrotate: @@ -191,8 +177,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - type-parameter: - type: '{type}' scm: - gerrit-trigger-scm: @@ -205,14 +189,26 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'verify-perf-{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-vpp-perf-hw.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh publishers: - archive-artifacts: @@ -266,7 +262,7 @@ 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: @@ -780,32 +776,25 @@ 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 @@ -826,12 +815,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: @@ -847,34 +839,88 @@ 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: + 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-ndrpdr-weekly-master-3n-skx' + + description: | + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: false @@ -895,12 +941,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: @@ -916,39 +965,25 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-check-{stream}' + name: 'csit-vpp-perf-mrr-daily-master' description: | - consumer - csit-dev perf code base checks - objective - check csit perf code base - job - name - csit-vpp-perf-check - trigger - see below - perf test-cases selection - all CSIT perf suites - keywords - format - keyword, tag_list - verify-perf-ndrdisc, NDRDISC - verify-perf-pdrdisc, PDRDISC - verify-perf-mrr, MRR - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - 2T2C - two worker threads, two cores - results - jjb verify - PASS/FAIL - present - no - analyse - csit project - catch malfunctions - catch degradations + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -966,77 +1001,126 @@ - gerrit-parameter: branch: '{branch}' - 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: + - 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 + + 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-non-activity-timeout: build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ndrdisc' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-pdrdisc' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-mrr' - 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 + # - timed: '0 2,16 * * *' + - timed: '0 16 * * 1,3,5' 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-check.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: - artifacts: 'archive/*.*' + artifacts: 'csit/archive/*.*' latest-only: false - robot: - output-path: archive + 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' + name: 'csit-vpp-perf-mrr-daily-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' @@ -1059,14 +1143,15 @@ build-timeout: '{build-timeout}' triggers: - - timed: '0 2,16 * * *' + # - timed: '0 2,16 * * *' + - timed: '0 16 * * 1,3,5' 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-mrr-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh publishers: - archive-artifacts: @@ -1089,24 +1174,22 @@ 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' @@ -1136,7 +1219,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: @@ -1156,47 +1239,50 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-verify-{stream}' + name: 'csit-vpp-perf-verify-{stream}-{topo}-{arch}' description: | - objective - perf verify - per csit gerrit patch - job - name - csit-vpp-perf-verify - trigger - keyword in comment to csit patch - perf test-cases selection - test-cases selected using trigger keywords paired with tags - all test-cases are labelled with CSIT RF topic tags defined in - csit/docs/tag_documentation.rst - proposed keywords - focus on testing specified vpp packet processing path - format - keyword - tag_list - perf_verify_ip4 - IP4Base, IP4Scale2M - perf_verify_ip6 - IP6Base, IP6Scale2M - perf_verify_l2 - L2XC, L2BD - perf_verify_lisp - 4Lisp, 6Lisp - perf_verify_vxlan - Vxlan - perf_verify_vhost - Vhost - perf_verify_memif - Memif - default tags for vpp startup config and perf test type - 1T1C - one worker thread, one core - X520 - x520 Niantic NIC - NDRDISC - discovery of NDR throughput - results - jjb verify - PASS/FAIL - present - no - analyse - no + + project-type: freestyle - node: 'ubuntu1604-basebuild-4c-4g' - concurrent: false + node: 'ubuntu1604-basebuild-8c-32g' + concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' @@ -1225,21 +1311,7 @@ server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'verify-perf-l2' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ip4' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ip6' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-lisp' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-vxlan' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-vhost' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-memif' - - comment-added-contains-event: - comment-contains-value: 'verify-perf-ipsechw' + comment-contains-value: 'csit-{topo}-{arch}-perftest' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -1254,7 +1326,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: @@ -1430,10 +1502,10 @@ 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: