X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=b04519140d95338153a2efd635a3da6b0eb44690;hb=7639d62b7b4fb5aa7e646f6e278f2f9edbc57d9d;hp=53694b06643d86f723eee6d1edbf87889a7a5393;hpb=5d6957213db905668370f4cd292f97f843c784c4;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 53694b066..b04519140 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -16,21 +16,15 @@ - 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' - '1810': branch: 'stable/1810' repo-stream-part: 'stable.1810' - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' - project: name: vpp-clang @@ -39,8 +33,8 @@ project: 'vpp' os: - - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' + - ubuntu1804: + repo-os-part: 'ubuntu.bionic.main' - centos7: repo-os-part: 'centos7' - opensuse: @@ -54,40 +48,38 @@ - project: name: vpp-misc jobs: - - 'vpp-csit-verify-virl-{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' - '1810': branch: 'stable/1810' repo-stream-part: 'stable.1810' - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: ubuntu1604 - project: name: vpp-perpatch jobs: - - 'vpp-csit-verify-perf-{stream}-2n-skx' + - 'vpp-csit-verify-device-{stream}-1n-skx' + - 'vpp-csit-verify-perf-{stream}-{node-arch}' project: 'vpp' stream: - master: branch: 'master' repo-stream-part: 'master' - os: ubuntu1604 + os: ubuntu1804 + node-arch: + - 2n-skx + - 3n-skx + - 3n-hsw - project: name: vpp-master-only @@ -102,6 +94,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' @@ -119,6 +114,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: - ubuntu1804: repo-os-part: 'ubuntu-arm.bionic.main' @@ -130,12 +128,6 @@ - 'vpp-arm-old-merge-{stream}-{os}' project: 'vpp' stream: - - '1804': - branch: 'stable/1804' - repo-stream-part: 'stable.1804' - - '1807': - branch: 'stable/1807' - repo-stream-part: 'stable.1807' - '1810': branch: 'stable/1810' repo-stream-part: 'stable.1810' @@ -143,12 +135,29 @@ - ubuntu1604: repo-os-part: 'ubuntu-arm.xenial.main' +- project: + name: vpp-view + views: + - project-view + project-name: vpp + - job-template: name: 'vpp-beta-verify-{stream}-{os}' project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + **/tmp/vpp-failed-unittests/*/* **/core + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + triggers: - gerrit-trigger-checkstyle: name: '{project}' @@ -171,6 +180,10 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -191,19 +204,8 @@ - include-raw-vpp-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: false max-failed-builds: 1 @@ -214,6 +216,15 @@ project-type: freestyle node: '{os}-us' + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -236,6 +247,10 @@ stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -286,16 +301,6 @@ - include-raw-vpp-maven-push.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' @@ -305,6 +310,15 @@ project-type: freestyle node: '{os}arm-us' concurrent: true + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -323,6 +337,10 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -348,16 +366,6 @@ - include-raw-vpp-arm-build-no-test.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' @@ -368,6 +376,15 @@ project-type: freestyle node: '{os}arm-us' concurrent: true + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -386,6 +403,10 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -412,25 +433,28 @@ - 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: false + max-failed-builds: 1 + fixed-delay: 90 - job-template: name: 'vpp-arm-merge-{stream}-{os}' project-type: freestyle node: '{os}arm-m' + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -453,6 +477,10 @@ stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -501,16 +529,6 @@ - ../scripts/packagecloud_push.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' @@ -519,6 +537,15 @@ project-type: freestyle node: '{os}arm-us' + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -541,6 +568,10 @@ stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -593,16 +624,6 @@ - include-raw-vpp-maven-push.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' @@ -690,6 +711,8 @@ !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh + - shell: + !include-raw-escape: include-raw-vpp-commitmsg.sh publishers: - fdio-infra-shiplogs: @@ -706,6 +729,15 @@ project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -724,6 +756,10 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -749,17 +785,6 @@ - include-raw-vpp-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' @@ -772,7 +797,7 @@ name: 'vpp-verify-{stream}-clang' project-type: freestyle - node: 'ubuntu1604-us' + node: 'ubuntu1804-us' concurrent: true build-discarder: @@ -789,7 +814,7 @@ - os-parameter: os: 'ubuntu1604' - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.xenial.main' + repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' @@ -830,6 +855,15 @@ project-type: freestyle node: '{os}-us' + archive-artifacts: > + **/build-root/*.rpm + **/build-root/*.deb + **/dpdk/*.rpm + **/dpdk/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -852,6 +886,10 @@ stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -904,16 +942,6 @@ - include-raw-vpp-maven-push.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' - naginator: @@ -922,11 +950,13 @@ fixed-delay: 90 - job-template: - name: 'vpp-csit-verify-virl-{stream}' + name: 'vpp-csit-verify-device-{stream}-1n-skx' project-type: freestyle - node: '{os}-us' + node: 'vpp-csit-device' concurrent: true + archive-artifacts: '**/csit_current/**/*.*' + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -942,14 +972,17 @@ - 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" + repo-name: '{repo-stream-part}.ubuntu.bionic.main' + - gerrit-refspec-parameter + - gerrit-event-type-parameter + - gerrit-event-comment-text-parameter + - gerrit-csit-refspec-parameter - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -962,43 +995,35 @@ build-timeout: '90' triggers: - - gerrit-trigger-csit-virltest: + - gerrit-trigger-csit-devicetest: name: '{project}' branch: '{branch}' builders: - - 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 + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - include-raw-vpp-csit-functional.sh + - include-raw-vpp-csit-device.sh - publishers: - - archive-artifacts: - artifacts: > - **/csit/report.html, - **/csit/log.html, - **/csit/output.xml - latest-only: false + publishers: - robot-report: - output-path: 'csit' + output-path: 'csit_current/' - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'vpp-csit-verify-perf-{stream}-2n-skx' + name: 'vpp-csit-verify-perf-{stream}-{node-arch}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' concurrent: true + archive-artifacts: > + **/csit_current/**/*.* + **/csit_parent/**/*.* + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1021,14 +1046,18 @@ - gerrit-csit-refspec-parameter - string: name: CSIT_PERF_TRIAL_DURATION - default: "1.0" + default: "10.0" description: "Duration of a trial measurement in BMRR tests." - string: name: CSIT_PERF_TRIAL_MULTIPLICITY - default: "8" + default: "5" description: "Number of subsamples for BMRR tests." - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -1044,21 +1073,27 @@ - gerrit-trigger-csit-perftest: name: '{project}' branch: '{branch}' + node-arch: '{node-arch}' builders: + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: - - clone-csit-run-main.sh + - include-raw-vpp-csit-perf.sh publishers: - - archive-artifacts: - artifacts: > - **/csit_new/**/*.*, - **/csit_parent/**/*.* - latest-only: false - - robot-report: - output-path: 'csit_new/0/' + output-path: 'csit_current/0/' - fdio-infra-shiplogs: maven-version: 'mvn33-new' + +- project: + name: vpp-info + project-name: vpp + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-4c-4g + project: vpp + branch: master