X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=8b15c6a6c512a22266dcb6d871a1a7e00ad85d77;hb=e0869ae6b03fc078bbf83acaaa9a6b2a22b214f2;hp=fe157ec5713062115bd1a86f8b91db83f8b73d09;hpb=89faa1b7c250a1c480cd54d972f1e2714b5b7ce5;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fe157ec57..8b15c6a6c 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -16,15 +16,15 @@ - master: branch: 'master' repo-stream-part: 'master' - - '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' + - '1908': + branch: 'stable/1908' + repo-stream-part: 'stable.1908' - project: name: vpp-clang @@ -54,32 +54,50 @@ - master: branch: 'master' repo-stream-part: 'master' - - '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' + - '1908': + branch: 'stable/1908' + repo-stream-part: 'stable.1908' os: ubuntu1604 - project: name: vpp-perpatch jobs: - - 'vpp-csit-verify-device-{stream}-1n-skx' + - 'vpp-csit-verify-device-{stream}-{device-node-arch}' - 'vpp-csit-verify-perf-{stream}-{node-arch}' project: 'vpp' + executor: 'vpp-csit-device' + skip-vote: 'true' + trigger: 'gerrit-trigger-csit-devicetest-full' stream: - master: branch: 'master' repo-stream-part: 'master' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' + - '1908': + branch: 'stable/1908' + repo-stream-part: 'stable.1908' os: ubuntu1804 + device-node-arch: + - 1n-skx + - 1n-tx2: + executor: 'vpp-csit-arm-ubuntu18' + trigger: 'gerrit-trigger-csit-devicetest-manual' node-arch: - 2n-skx - 3n-skx - 3n-hsw + exclude: + - stream: '1904' + os: 'ubuntu1804' + device-node-arch: '1n-tx2' - project: name: vpp-master-only @@ -97,6 +115,9 @@ - '1904': branch: 'stable/1904' repo-stream-part: 'stable.1904' + - '1908': + branch: 'stable/1908' + repo-stream-part: 'stable.1908' os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' @@ -117,23 +138,36 @@ - '1904': branch: 'stable/1904' repo-stream-part: 'stable.1904' + - '1908': + branch: 'stable/1908' + repo-stream-part: 'stable.1908' os: - ubuntu1804: repo-os-part: 'ubuntu-arm.bionic.main' +# TODO: Merge with (e.g.) vpp-perpatch or similar, +# when number of stable branches supported matches. - project: - name: vpp-arm-old + name: vpp-api-crc jobs: - - 'vpp-arm-old-verify-{stream}-{os}' - - 'vpp-arm-old-merge-{stream}-{os}' + - 'vpp-csit-verify-api-crc-{stream}' project: 'vpp' + executor: 'vpp-csit-device' + skip-vote: 'false' stream: - - '1810': - branch: 'stable/1810' - repo-stream-part: 'stable.1810' - os: - - ubuntu1604: - repo-os-part: 'ubuntu-arm.xenial.main' + # TODO: Add stable/1908 when it is created. + - master: + branch: 'master' + os: ubuntu1804 + +- project: + name: vpp-info + project-name: vpp + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-4c-4g + project: vpp + branch: master - project: name: vpp-view @@ -147,6 +181,17 @@ 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}' @@ -169,6 +214,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: @@ -189,19 +238,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' + maven-version: 'mvn36' - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -212,6 +250,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}' @@ -234,6 +281,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: @@ -259,13 +310,6 @@ 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: @@ -278,87 +322,10 @@ - shell: !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/*.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-arm-old-verify-{stream}-{os}' - - project-type: freestyle - node: '{os}arm-us' - concurrent: true - - build-discarder: - 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}' - - stream-parameter: - stream: '{stream}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - fdio-infra-wrappers: - build-timeout: 120 - - triggers: - - gerrit-trigger-checkstyle: - name: '{project}' - branch: '{branch}' - - builders: - - shell: - !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh - - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - 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' + maven-version: 'mvn36' - job-template: name: 'vpp-arm-verify-{stream}-{os}' @@ -366,6 +333,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}' @@ -384,6 +360,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: @@ -410,18 +390,8 @@ - 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' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -433,6 +403,15 @@ 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}' @@ -455,6 +434,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: @@ -480,101 +463,6 @@ 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_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-no-test.sh - - - provide-maven-settings: - settings-file: 'vpp-settings' - global-settings-file: 'global-settings' - - shell: - !include-raw-escape: - - ../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' - -- job-template: - name: 'vpp-arm-old-merge-{stream}-{os}' - - project-type: freestyle - node: '{os}arm-us' - - build-discarder: - 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}' - - 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: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers: - build-timeout: 120 - - triggers: - - 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_arm_test.sh - shell: @@ -589,24 +477,10 @@ - shell: !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/*.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' + maven-version: 'mvn36' - job-template: name: 'vpp-checkstyle-verify-{stream}' @@ -697,7 +571,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: true @@ -710,6 +584,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}' @@ -728,6 +611,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: @@ -753,19 +640,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' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -822,7 +698,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -834,6 +710,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}' @@ -856,6 +741,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: @@ -881,13 +770,6 @@ 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 - shell: @@ -902,35 +784,23 @@ - shell: !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/*.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' + maven-version: 'mvn36' - naginator: rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 - job-template: - name: 'vpp-csit-verify-device-{stream}-1n-skx' + name: 'vpp-csit-verify-device-{stream}-{device-node-arch}' project-type: freestyle - node: 'vpp-csit-device' + node: '{executor}' concurrent: true + archive-artifacts: '**/csit_current/**/*.*' + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -953,6 +823,10 @@ - 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: @@ -965,29 +839,27 @@ build-timeout: '90' triggers: - - gerrit-trigger-csit-devicetest: + - '{trigger}': name: '{project}' branch: '{branch}' + skip-vote: '{skip-vote}' builders: - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh - shell: !include-raw-escape: - - include-raw-vpp-csit-device.sh - + - include-raw-vpp-parallel-vars.sh + - include-raw-vpp-csit-device.sh publishers: - - archive-artifacts: - artifacts: > - **/csit_current/**/*.* - latest-only: false - - robot-report: output-path: 'csit_current/' - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' - job-template: name: 'vpp-csit-verify-perf-{stream}-{node-arch}' @@ -995,6 +867,10 @@ project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: > + **/csit_current/**/*.* + **/csit_parent/**/*.* + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1025,6 +901,10 @@ 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: @@ -1046,18 +926,70 @@ - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: - !include-raw-escape: - - include-raw-vpp-csit-perf.sh + !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh + - shell: + !include-raw-escape: include-raw-vpp-csit-perf.sh publishers: - - archive-artifacts: - artifacts: > - **/csit_current/**/*.*, - **/csit_parent/**/*.* - latest-only: false - - robot-report: output-path: 'csit_current/0/' - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' + +- job-template: + name: 'vpp-csit-verify-api-crc-{stream}' + + project-type: freestyle + node: '{os}-us' + concurrent: true + archive-artifacts: '' + latest-only: false + + build-discarder: + 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}' + - gerrit-refspec-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: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 300 + + triggers: + # TODO: Make other verify jobs trigger on success of this one, + # without breaking verification for VPP branches before stable/1908. + - gerrit-trigger-checkstyle: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: check_crc.sh + # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn36'