X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=f160cc442224a3c12de43e5c6ca11a8b611b9ec2;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=4862270951c171960b3f58c2d0ff3f61278d497c;hpb=d39bbb6755e2af8a211eb323ee8bd9bcf93ee4ce;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 486227095..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: @@ -26,6 +22,9 @@ - '1804': branch: 'stable/1804' repo-stream-part: 'stable.1804' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' type: - short - long @@ -53,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: @@ -66,6 +64,20 @@ - '1804': branch: 'stable/1804' repo-stream-part: 'stable.1804' + - '1807': + branch: 'stable/1807' + 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: @@ -78,6 +90,9 @@ - master: branch: 'master' repo-stream-part: 'master' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' @@ -95,6 +110,9 @@ - '1804': branch: 'stable/1804' repo-stream-part: 'stable.1804' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' os: - ubuntu1604: repo-os-part: 'ubuntu-arm.xenial.main' @@ -106,11 +124,11 @@ node: '{os}-us' concurrent: true triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -125,6 +143,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -164,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}' @@ -194,7 +214,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-patch-merged: @@ -228,11 +248,12 @@ 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: @@ -243,10 +264,6 @@ 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-arm-verify-{stream}-{os}' @@ -255,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}' @@ -270,6 +287,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -279,19 +298,20 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' 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: @@ -303,10 +323,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 - job-template: name: 'vpp-arm-merge-{stream}-{os}' @@ -314,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}' @@ -344,7 +360,7 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - gerrit-trigger-patch-merged: @@ -378,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: @@ -393,10 +409,6 @@ 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-checkstyle-verify-{stream}' @@ -405,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}' @@ -435,14 +447,34 @@ - gerrit: server-name: 'Primary' trigger-on: + - patchset-created-event: + exclude-drafts: 'true' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'true' + - draft-published-event - comment-added-contains-event: comment-contains-value: 'checkstylecheck' + - comment-added-contains-event: + comment-contains-value: 'docsonly' + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' project-pattern: '{project}' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: REG_EXP + pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$ + 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 gerrit-build-successful-verified-value: 1 @@ -470,8 +502,6 @@ max-failed-builds: 1 fixed-delay: 90 - - - job-template: name: 'vpp-verify-{stream}-{os}' @@ -479,7 +509,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -494,6 +524,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -503,18 +535,14 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: @@ -543,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}' @@ -558,6 +586,8 @@ os: 'ubuntu1604' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -570,7 +600,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -596,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}' @@ -662,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: @@ -689,7 +719,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -709,6 +739,8 @@ - string: name: CSIT_REF description: "Also testing CSIT_REF" + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -718,10 +750,10 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: '90' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle-nonvoting: name: '{project}' branch: '{branch}' @@ -729,9 +761,6 @@ - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop' - inject: properties-file: variables.prop - - shell: - !include-raw-escape: - - include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -752,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}' @@ -778,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: @@ -790,30 +826,14 @@ wrappers: - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 30 + build-timeout: 300 triggers: - gerrit: server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-l2' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip4' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip6' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-lisp' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vxlan' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vhost' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-acl' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-memif' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ipsechw' + comment-contains-value: 'perftest' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -821,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' @@ -857,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-trivial-patch-submitted: - 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-trivial-patch-submitted: - 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 - -