X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=18015132ef20b28245976794516a885e594a8f8f;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=4c82ae0d4ebb4bf03c5ef5a641e1eb2006443d04;hpb=09238a9a45a2556bda9a299c0788e6a4679e0f67;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 4c82ae0d4..f160cc442 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,88 +1,136 @@ +--- - project: name: vpp jobs: - 'vpp-verify-{stream}-{os}' - 'vpp-merge-{stream}-{os}' - - 'vpp-verify-image-{stream}-{os}' - - 'vpp-docs-merge-{stream}' - - 'vpp-docs-verify-{stream}' - - 'vpp-make-test-docs-merge-{stream}' - - 'vpp-make-test-docs-verify-{stream}' - - 'vpp-test-packagecloud-{stream}-{os}' project: 'vpp' os: - - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' - - centos7: - repo-os-part: 'centos7' + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + - centos7: + repo-os-part: 'centos7' + stream: - master: branch: 'master' repo-stream-part: 'master' - - test: - branch: 'stable/test' - repo-stream-part: 'stable.test' - - '1606': - branch: 'stable/1606' - repo-stream-part: 'stable.1606' - - '1609': - branch: 'stable/1609' - repo-stream-part: 'stable.1609' - - '1701': - branch: 'stable/1701' - repo-stream-part: 'stable.1701' - - '1704': - branch: 'stable/1704' - repo-stream-part: 'stable.1704' - - '1707': - branch: 'stable/1707' - repo-stream-part: 'stable.1707' + - '1801': + branch: 'stable/1801' + repo-stream-part: 'stable.1801' + - '1804': + branch: 'stable/1804' + repo-stream-part: 'stable.1804' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' 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-hw-perf-{stream}' + - 'vpp-checkstyle-verify-{stream}' + project: 'vpp' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + - '1801': + branch: 'stable/1801' + repo-stream-part: 'stable.1801' + - '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' - - test: - branch: 'stable/test' - repo-stream-part: 'stable.test' - - '1606': - branch: 'stable/1606' - repo-stream-part: 'stable.1606' - - '1609': - branch: 'stable/1609' - repo-stream-part: 'stable.1609' - - '1701': - branch: 'stable/1701' - repo-stream-part: 'stable.1609' - - '1704': - branch: 'stable/1704' - repo-stream-part: 'stable.1704' - - '1707': - branch: 'stable/1707' - repo-stream-part: 'stable.1707' os: ubuntu1604 +- project: + name: vpp-master-only + jobs: + - 'vpp-beta-verify-{stream}-{os}' + - 'vpp-beta-merge-{stream}-{os}' + project: 'vpp' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' + os: + - ubuntu1804: + repo-os-part: 'ubuntu.bionic.main' + +- 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' + - '1807': + branch: 'stable/1807' + repo-stream-part: 'stable.1807' + os: + - ubuntu1604: + repo-os-part: 'ubuntu-arm.xenial.main' - job-template: - name: 'vpp-verify-{stream}-{os}' + name: 'vpp-beta-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-us' concurrent: true + triggers: + - gerrit-trigger-checkstyle: + name: '{project}' + branch: '{branch}' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -95,6 +143,8 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -106,16 +156,9 @@ - fdio-infra-wrappers: build-timeout: '{build-timeout}' - triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' - builders: - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh @@ -129,17 +172,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-verify-image-{stream}-{os}' + name: 'vpp-beta-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' - concurrent: true + node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -150,58 +197,84 @@ 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}' + build-timeout: 120 triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-images' - 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: include-raw-vpp-checkstyle.sh + !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/packagecloud_push.sh + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - 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' - job-template: - name: 'vpp-merge-{stream}-{os}' + name: 'vpp-arm-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}arm-us' + concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -212,59 +285,34 @@ 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}' + - stream-parameter: + stream: '{stream}' 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}' + build-timeout: 120 triggers: - - gerrit-trigger-patch-merged: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - 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 + !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_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-parallel-vars.sh + - include-raw-vpp-arm-build.sh publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' @@ -274,17 +322,17 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - job-template: - name: 'vpp-csit-verify-virl-{stream}' + name: 'vpp-arm-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' - concurrent: true + node: '{os}arm-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -295,57 +343,81 @@ 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}.ubuntu.xenial.main' - - is-csit-vpp-job-parameter: - is-csit-vpp-job: 'True' + 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}' + build-timeout: 120 triggers: - - gerrit-trigger-patch-submitted: + - 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: - - include-raw-vpp-checkstyle.sh + !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: - - include-raw-vpp-csit-functional.sh + - ../scripts/packagecloud_push.sh + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh publishers: - - archive-artifacts: - artifacts: 'csit/report.html, csit/log.html, csit/output.xml' - latest-only: false - - - robot-report: - output-path: 'csit' - + - 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' - job-template: - name: 'vpp-csit-verify-hw-perf-{stream}' + name: 'vpp-checkstyle-verify-{stream}' project-type: freestyle - node: '{os}-basebuild-4c-4g' - concurrent: false + node: '{os}-us' + concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -360,8 +432,6 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' - - is-csit-vpp-job-parameter: - is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -370,76 +440,78 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: 30 + - fdio-infra-wrappers: + 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' + - draft-published-event - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-l2' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip4' + comment-contains-value: 'checkstylecheck' - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip6' + comment-contains-value: 'docsonly' - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-lisp' + comment-contains-value: 'recheck' - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vxlan' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vhost' + comment-contains-value: 'reverify' projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - 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 + 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: false + successful: true failed: false unstable: false notbuilt: false builders: - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh + !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: - - include-raw-vpp-csit-verify-perf.sh + !include-raw-escape: include-raw-vpp-test-checkstyle.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' - -- parameter: - name: type-parameter - - parameters: - - string: - name: TYPE - default: '{type}' - description: "TYPE parameter if not given by trigger" + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 90 - job-template: - name: 'vpp-docs-verify-{stream}' + name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -449,9 +521,11 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -461,44 +535,43 @@ wrappers: - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: 120 triggers: - - gerrit-trigger-patch-submitted: + - 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: include-raw-vpp-docs.sh + !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: - artifacts: 'build-root/docs/html/*' + 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: false + max-failed-builds: 2 + fixed-delay: 90 - job-template: - name: 'vpp-docs-merge-{stream}' + name: 'vpp-verify-{stream}-clang' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: 'ubuntu1604-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -511,73 +584,51 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - stream-parameter: + stream: '{stream}' 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: - - 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 + - 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: include-raw-vpp-docs.sh + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-clang-build.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' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 - job-template: - name: 'vpp-make-test-docs-verify-{stream}' + name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g - concurrent: true + node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -587,26 +638,40 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + 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-patch-submitted: + - 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' @@ -614,31 +679,49 @@ 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: include-raw-vpp-make-test-docs.sh + !include-raw-escape: + - ../scripts/packagecloud_push.sh + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + publishers: - archive: - artifacts: 'build-root/test-doc/build/html/*' + 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' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 - job-template: - name: 'vpp-make-test-docs-merge-{stream}' + name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -648,74 +731,66 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' - - maven-exec: - maven-version: 'mvn33-new' + 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" + - stream-parameter: + stream: '{stream}' 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}' + build-timeout: '90' 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 + - gerrit-trigger-checkstyle-nonvoting: + 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: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - 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-make-test-docs.sh + !include-raw-escape: + - include-raw-vpp-csit-functional.sh + publishers: - - archive: - artifacts: 'build-root/test-doc/build/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false + - 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' - job-template: - name: 'vpp-test-packagecloud-{stream}-{os}' + name: 'vpp-csit-verify-perf-{stream}-2n-skx' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' @@ -726,10 +801,22 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + 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}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -738,40 +825,48 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 300 triggers: - - gerrit-trigger-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'test-pkgcloud' - + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'perftest' + 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: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - #variable: 'SETTINGS_FILE' - - 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_dpdk_dev_env.sh - - include-raw-vpp-build.sh - shell: !include-raw-escape: - - ../scripts/packagecloud_push.sh + - clone-csit-run-main.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 + - archive-artifacts: + artifacts: 'csit_new/*.*, csit_parent/*.*' + latest-only: false + + - robot-report: + output-path: 'csit_new/' + - fdio-infra-shiplogs: maven-version: 'mvn33-new' + +- parameter: + name: type-parameter + + parameters: + - string: + name: TYPE + default: '{type}' + description: "TYPE parameter if not given by trigger"