X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=265f064c5526efa65d7356109cb29f17ecf9a14b;hb=afa93548e3aba337a06a4edf49cf748e5ea657ec;hp=3dfd499e04961a4b0df68f75f7ce512dbd08445a;hpb=004c12d5e5175d3c66fbe05e87d33625d405c9de;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 3dfd499e0..265f064c5 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -16,9 +16,6 @@ - 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' @@ -54,9 +51,6 @@ - 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' @@ -68,18 +62,31 @@ - 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' stream: - master: branch: 'master' repo-stream-part: 'master' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: ubuntu1804 + device-node-arch: + - 1n-skx + - 1n-tx2: + executor: 'vpp-csit-arm-ubuntu18' node-arch: - 2n-skx - 3n-skx - 3n-hsw + exclude: + - stream: '1904' + os: 'ubuntu1804' + device-node-arch: '1n-tx2' - project: name: vpp-master-only @@ -121,19 +128,29 @@ - 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 @@ -205,7 +222,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -276,13 +293,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: @@ -295,80 +305,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: - 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 - 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}' - 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}' - - 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: - 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: - - 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}' @@ -434,7 +374,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -506,13 +446,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: @@ -530,102 +463,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'vpp-arm-old-merge-{stream}-{os}' - - 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}' - 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}' - - 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: '' - 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: - !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 - - shell: - !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-vpp-maven-push.sh - - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' - job-template: name: 'vpp-checkstyle-verify-{stream}' @@ -716,7 +554,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: true @@ -786,7 +624,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -843,7 +681,7 @@ publishers: - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + maven-version: 'mvn36' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false @@ -915,13 +753,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: @@ -936,24 +767,20 @@ - 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' + 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 @@ -998,21 +825,24 @@ - gerrit-trigger-csit-devicetest: 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: - 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}' @@ -1079,12 +909,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: - 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-nonvoting: + 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'