X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=f160cc442224a3c12de43e5c6ca11a8b611b9ec2;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=c1fea670f46d4864da3800e354fcb8be5668c81d;hpb=9a961ae6bbb24cf430493720942a74d36a541742;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index c1fea670f..f160cc442 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -4,10 +4,6 @@ jobs: - 'vpp-verify-{stream}-{os}' - 'vpp-merge-{stream}-{os}' - - 'vpp-docs-merge-{stream}' - - 'vpp-docs-verify-{stream}' - - 'vpp-make-test-docs-merge-{stream}' - - 'vpp-make-test-docs-verify-{stream}' project: 'vpp' os: @@ -56,7 +52,6 @@ name: vpp-misc jobs: - 'vpp-csit-verify-virl-{stream}' - - 'vpp-csit-verify-hw-perf-{stream}' - 'vpp-checkstyle-verify-{stream}' project: 'vpp' stream: @@ -74,6 +69,17 @@ repo-stream-part: 'stable.1807' os: ubuntu1604 +- project: + name: vpp-perpatch + jobs: + - 'vpp-csit-verify-perf-{stream}-2n-skx' + project: 'vpp' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + os: ubuntu1604 + - project: name: vpp-master-only jobs: @@ -122,7 +128,7 @@ name: '{project}' branch: '{branch}' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -137,6 +143,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -176,7 +184,7 @@ project-type: freestyle node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -206,7 +214,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-patch-merged: @@ -264,7 +272,7 @@ node: '{os}arm-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -279,6 +287,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -288,7 +298,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-checkstyle: @@ -297,10 +307,11 @@ builders: - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-parallel-vars.sh - include-raw-vpp-arm-build.sh publishers: - archive: @@ -319,7 +330,7 @@ project-type: freestyle node: '{os}arm-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -349,7 +360,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-patch-merged: @@ -383,11 +394,11 @@ global-settings-file: 'global-settings' - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-vpp-maven-push.sh + - ../scripts/packagecloud_push.sh - shell: !include-raw-escape: - - ../scripts/packagecloud_push.sh + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh publishers: - archive: @@ -406,7 +417,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -461,6 +472,8 @@ forbidden-file-paths: - compare-type: REG_EXP pattern: .*docs\/.* + - compare-type: REG_EXP + pattern: .*extras\/emacs\/.* disable-strict-forbidden-file-verification: 'true' override-votes: true gerrit-build-notbuilt-verified-value: 0 @@ -489,8 +502,6 @@ max-failed-builds: 1 fixed-delay: 90 - - - job-template: name: 'vpp-verify-{stream}-{os}' @@ -498,7 +509,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -513,6 +524,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -522,7 +535,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-checkstyle: @@ -558,7 +571,7 @@ node: 'ubuntu1604-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -573,6 +586,8 @@ os: 'ubuntu1604' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -611,7 +626,7 @@ project-type: freestyle node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -677,11 +692,11 @@ global-settings-file: 'global-settings' - shell: !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-vpp-maven-push.sh + - ../scripts/packagecloud_push.sh - shell: !include-raw-escape: - - ../scripts/packagecloud_push.sh + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh publishers: - archive: @@ -704,7 +719,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -724,6 +739,8 @@ - string: name: CSIT_REF description: "Also testing CSIT_REF" + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -733,7 +750,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: '90' triggers: - gerrit-trigger-checkstyle-nonvoting: @@ -764,19 +781,14 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - - job-template: - name: 'vpp-csit-verify-hw-perf-{stream}' + name: 'vpp-csit-verify-perf-{stream}-2n-skx' project-type: freestyle node: '{os}-basebuild-8c-32g' - concurrent: false + concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -790,9 +802,21 @@ - os-parameter: os: '{os}' - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.xenial.main' - - is-csit-vpp-job-parameter: - is-csit-vpp-job: 'True' + repo-name: '{repo-stream-part}.ubuntu.bionic.main' + - gerrit-refspec-parameter + - gerrit-event-type-parameter + - gerrit-event-comment-text-parameter + - gerrit-csit-refspec-parameter + - string: + name: CSIT_PERF_TRIAL_DURATION + default: "1.0" + description: "Duration of a trial measurement in BMRR tests." + - string: + name: CSIT_PERF_TRIAL_MULTIPLICITY + default: "30" + description: "Number of subsamples for BMRR tests." + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -802,7 +826,7 @@ wrappers: - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 30 + build-timeout: 300 triggers: - gerrit: @@ -817,30 +841,23 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' skip-vote: - successful: false - failed: false - unstable: false - notbuilt: false + successful: true + failed: true + unstable: true + notbuilt: true builders: - - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop' - - inject: - properties-file: variables.prop - shell: !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh - - shell: - !include-raw-escape: - - include-raw-vpp-csit-verify-perf.sh + - clone-csit-run-main.sh publishers: - archive-artifacts: - artifacts: 'csit/report.html, csit/log.html, csit/output.xml' + artifacts: 'csit_new/*.*, csit_parent/*.*' latest-only: false - robot-report: - output-path: 'csit' + output-path: 'csit_new/' - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -853,306 +870,3 @@ name: TYPE default: '{type}' description: "TYPE parameter if not given by trigger" - -- job-template: - name: 'vpp-docs-verify-{stream}' - - project-type: freestyle - node: ubuntu1604-us - 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}' - - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-checkstyle: - name: '{project}' - branch: '{branch}' - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - - shell: - !include-raw-escape: include-raw-vpp-docs.sh - publishers: - - archive: - artifacts: 'build-root/docs/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - -- job-template: - name: 'vpp-docs-merge-{stream}' - - project-type: freestyle - node: ubuntu1604-us - 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}' - - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1604' - result: 'success' - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-docs' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - - shell: - !include-raw-escape: include-raw-vpp-docs.sh - publishers: - - archive: - artifacts: 'build-root/docs/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - - -- job-template: - name: 'vpp-make-test-docs-verify-{stream}' - - project-type: freestyle - node: ubuntu1604-us - 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}' - - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-checkstyle: - name: '{project}' - branch: '{branch}' - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - - shell: - !include-raw-escape: include-raw-vpp-make-test-docs.sh - publishers: - - archive: - artifacts: 'build-root/test-doc/build/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - -- job-template: - name: 'vpp-make-test-docs-merge-{stream}' - - project-type: freestyle - node: ubuntu1604-us - 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}' - - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1604' - result: 'success' - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-docs' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - - shell: - !include-raw-escape: include-raw-vpp-make-test-docs.sh - publishers: - - archive: - artifacts: 'build-root/test-doc/build/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - -