X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=b12afd8a6fab40e481d5b827c9571ce086266f3e;hb=6baece1aa46181bb3021dd896f934c7e753ef234;hp=d0e1da4d02523fe5ae6bda9ebc5c782970a6985c;hpb=74650768d74e88025dfc9a906359a9f479126236;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index d0e1da4d0..b12afd8a6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -4,8 +4,6 @@ jobs: - 'vpp-verify-{stream}-{os}' - 'vpp-merge-{stream}-{os}' - - 'vpp-verify-os-{stream}-{os}' - - 'vpp-merge-os-{stream}-{os}' - 'vpp-docs-merge-{stream}' - 'vpp-docs-verify-{stream}' - 'vpp-make-test-docs-merge-{stream}' @@ -17,28 +15,44 @@ repo-os-part: 'ubuntu.xenial.main' - centos7: repo-os-part: 'centos7' - - opensuse: - repo-os-part: 'opensuse' stream: - master: branch: 'master' repo-stream-part: 'master' - - '1710': - branch: 'stable/1710' - repo-stream-part: 'stable.1710' - '1801': branch: 'stable/1801' repo-stream-part: 'stable.1801' + - '1804': + branch: 'stable/1804' + repo-stream-part: 'stable.1804' type: - short - long +- project: + name: vpp-clang + jobs: + - 'vpp-verify-{stream}-clang' + + project: 'vpp' + os: + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + - centos7: + repo-os-part: 'centos7' + - opensuse: + repo-os-part: 'opensuse' + + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + - project: name: vpp-misc jobs: - 'vpp-csit-verify-virl-{stream}' - - 'vpp-csit-verify-os-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}' - 'vpp-checkstyle-verify-{stream}' project: 'vpp' @@ -46,18 +60,19 @@ - master: branch: 'master' repo-stream-part: 'master' - - '1710': - branch: 'stable/1710' - repo-stream-part: 'stable.1710' - '1801': branch: 'stable/1801' repo-stream-part: 'stable.1801' + - '1804': + branch: 'stable/1804' + repo-stream-part: 'stable.1804' os: ubuntu1604 - project: - name: vpp-beta + name: vpp-master-only jobs: - 'vpp-beta-verify-{stream}-{os}' + - 'vpp-beta-merge-{stream}-{os}' project: 'vpp' stream: - master: @@ -66,21 +81,23 @@ os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' - - osleap15: - repo-os-part: 'osleap15' - project: name: vpp-arm jobs: - 'vpp-arm-verify-{stream}-{os}' + - 'vpp-arm-merge-{stream}-{os}' project: 'vpp' stream: - master: branch: 'master' repo-stream-part: 'master' + - '1804': + branch: 'stable/1804' + repo-stream-part: 'stable.1804' os: - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' + repo-os-part: 'ubuntu-arm.xenial.main' - job-template: name: 'vpp-beta-verify-{stream}-{os}' @@ -89,32 +106,13 @@ node: '{os}-us' concurrent: true triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - patchset-uploaded-event: 'false' - - comment-added-contains-event: - comment-contains-value: 'betacheck' - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - 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 - override-votes: true - gerrit-build-notbuilt-verified-value: 0 - notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.' + - gerrit-trigger-checkstyle: + name: '{project}' + branch: '{branch}' logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -143,6 +141,7 @@ !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh - include-raw-vpp-build.sh publishers: - archive: @@ -155,20 +154,19 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: - name: 'vpp-arm-verify-{stream}-{os}' + name: 'vpp-beta-merge-{stream}-{os}' project-type: freestyle - node: '{os}arm-us' - concurrent: true + node: '{os}-us' logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -179,46 +177,63 @@ branch: '{branch}' - os-parameter: os: '{os}' + - maven-project-parameter: + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' + - stream-parameter: + stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '' + choosing-strategy: 'default' wrappers: - fdio-infra-wrappers: build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'armcheck' - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - 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 + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root' + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - include-raw-vpp-build.sh + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' @@ -228,18 +243,21 @@ default-excludes: false - 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-checkstyle-verify-{stream}' + name: 'vpp-arm-verify-{stream}-{os}' project-type: freestyle - node: '{os}-us' + node: '{os}arm-us' concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -251,7 +269,7 @@ - os-parameter: os: '{os}' - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.xenial.main' + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -264,54 +282,41 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - patchset-created-event: - exclude-drafts: 'true' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'true' - - patchset-uploaded-event: 'false' - - comment-added-contains-event: - comment-contains-value: 'checkstylecheck' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - override-votes: true - gerrit-build-notbuilt-verified-value: 0 - gerrit-build-successful-verified-value: 0 - notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.' - failed-message: 'Checkstyle failed. No further verify jobs will be started.' - successful-message: 'checkstyle_success' + - gerrit-trigger-checkstyle: + name: '{project}' + branch: '{branch}' builders: - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh - + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-arm-build.sh publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: - name: 'vpp-verify-{stream}-{os}' + name: 'vpp-arm-merge-{stream}-{os}' project-type: freestyle - node: '{os}-us' - concurrent: true + node: '{os}arm-us' logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -322,35 +327,63 @@ branch: '{branch}' - os-parameter: os: '{os}' + - maven-project-parameter: + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' + - stream-parameter: + stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + refspec: '' + choosing-strategy: 'default' wrappers: - fdio-infra-wrappers: build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-patch-merged: name: '{project}' branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root' + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + - include-raw-vpp-arm-build.sh + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' @@ -360,17 +393,16 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true - max-failed-builds: 2 - fixed-delay: 10 + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 - job-template: - name: 'vpp-verify-os-{stream}-{os}' + name: 'vpp-checkstyle-verify-{stream}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' concurrent: true logrotate: @@ -387,7 +419,7 @@ - os-parameter: os: '{os}' - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' + repo-name: '{repo-stream-part}.ubuntu.xenial.main' scm: - gerrit-trigger-scm: @@ -400,18 +432,96 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-os-trivial-patch-submitted: - name: '{project}' - branch: '{branch}' + - 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: '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}' + override-votes: true + gerrit-build-notbuilt-verified-value: 0 + gerrit-build-successful-verified-value: 1 + notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.' + failed-message: 'Checkstyle failed. No further verify jobs will be started.' + successful-message: 'checkstyle_success' + skip-vote: + successful: true + failed: false + unstable: false + notbuilt: false builders: - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 90 + + + +- job-template: + name: 'vpp-verify-{stream}-{os}' + + project-type: freestyle + node: '{os}-us' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + + 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: - shell: - !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_docker_test.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh @@ -426,12 +536,17 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 2 + fixed-delay: 90 - job-template: - name: 'vpp-merge-{stream}-{os}' + name: 'vpp-verify-{stream}-clang' project-type: freestyle - node: '{os}-us' + node: 'ubuntu1604-us' + concurrent: true logrotate: daysToKeep: '{build-days-to-keep}' @@ -445,89 +560,50 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: '{os}' - - maven-project-parameter: - maven: 'mvn33-new' - - maven-exec: - maven-version: 'mvn33-new' - - stream-parameter: - stream: '{stream}' + os: 'ubuntu1604' - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' + repo-name: '{repo-stream-part}.ubuntu.xenial.main' scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - fdio-infra-wrappers: build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-merged: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/home/jenkins' - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'vpp-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-vpp-maven-push.sh - - shell: - !include-raw-escape: - - ../scripts/packagecloud_push.sh - + - include-raw-vpp-clang-build.sh publishers: - - archive: - artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: - name: 'vpp-merge-os-{stream}-{os}' + name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -558,7 +634,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-os-patch-merged: + - gerrit-trigger-patch-merged: name: '{project}' branch: '{branch}' @@ -566,11 +642,11 @@ - config-file-provider: files: - file-id: '.packagecloud' - target: '/home/jenkins' + target: '/root' - config-file-provider: files: - file-id: 'packagecloud_api' - target: '/home/jenkins' + target: '/root' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -581,8 +657,7 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_docker_test.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh @@ -607,6 +682,10 @@ 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-csit-verify-virl-{stream}' @@ -617,7 +696,7 @@ logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -647,7 +726,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -655,9 +734,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 @@ -679,80 +755,9 @@ maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 - - -- job-template: - name: 'vpp-csit-verify-os-virl-{stream}' - - project-type: freestyle - node: '{os}-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}' - - 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' - - string: - name: CSIT_REF - description: "Also testing CSIT_REF" - - 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-os-trivial-patch-submitted: - name: '{project}' - branch: '{branch}' - - builders: - - 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 - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh - - shell: - !include-raw-escape: - - include-raw-vpp-csit-functional.sh - - publishers: - - archive-artifacts: - artifacts: 'csit/report.html, csit/log.html, csit/output.xml' - latest-only: false - - - robot-report: - output-path: 'csit' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + fixed-delay: 90 - job-template: name: 'vpp-csit-verify-hw-perf-{stream}' @@ -763,7 +768,7 @@ logrotate: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -794,23 +799,7 @@ 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}' @@ -889,7 +878,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -918,9 +907,9 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: name: 'vpp-docs-merge-{stream}' @@ -1001,9 +990,9 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: @@ -1040,7 +1029,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-trivial-patch-submitted: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -1069,9 +1058,9 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90 - job-template: name: 'vpp-make-test-docs-merge-{stream}' @@ -1152,8 +1141,8 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 - fixed-delay: 10 + fixed-delay: 90