X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=61c6ac1fbac3dbfc10471a4f3eeeaed00451cffd;hb=3ea29d4b142dce69aadf0d7b70cfebb1e290b4b0;hp=96f822acf6c4b9ea1c9a43b8e377695f2377566e;hpb=b1a290d47873240f08f85f35b9779947c13e1470;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 96f822acf..61c6ac1fb 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -6,6 +6,9 @@ - '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: @@ -28,6 +31,9 @@ - '1609': branch: 'stable/1609' repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1701' type: - short - long @@ -37,7 +43,6 @@ jobs: - 'vpp-csit-verify-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}-{type}' - - 'vpp-csit-verify-virl-1604-test-{stream}' project: 'vpp' stream: - master: @@ -52,8 +57,11 @@ - '1609': branch: 'stable/1609' repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1609' - os: ubuntu1404 + os: ubuntu1604 type: - all - short @@ -63,7 +71,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -79,6 +87,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -99,73 +109,26 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !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 publishers: - archive: - artifacts: 'build-root/*.rpm,build-root/*.deb' + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' allow-empty: 'true' fingerprint: false only-if-success: true default-excludes: false - -- job-template: - name: 'vpp-csit-verify-virl-1604-test-{stream}' - - project-type: freestyle - node: 'verify-ubuntu1604' - 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: 'ubuntu1604' - - 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-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'virl-1604-test' - - builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: 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' - job-template: name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle - node: 'verify-image-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -181,6 +144,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: @@ -214,13 +179,19 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' - job-template: name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: 'merge-{os}' + node: '{os}-basebuild-4c-4g' logrotate: daysToKeep: '{build-days-to-keep}' @@ -236,7 +207,9 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: 'mvn33' + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' @@ -256,17 +229,19 @@ branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-build.sh - maven-target: - maven-version: 'mvn33' + 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_dpdk_dev_env.sh + - include-raw-vpp-build.sh - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' @@ -276,17 +251,19 @@ - include-raw-vpp-maven-push.sh publishers: - archive: - artifacts: 'build-root/*.rpm,build-root/*.deb' + 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-virl-{stream}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -302,6 +279,10 @@ 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' scm: - gerrit-trigger-scm: @@ -322,7 +303,9 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-functional.sh @@ -334,11 +317,14 @@ - robot-report: output-path: 'csit' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - job-template: name: 'vpp-csit-verify-hw-perf-{stream}-{type}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: false logrotate: @@ -354,8 +340,12 @@ branch: '{branch}' - os-parameter: os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' - type-parameter: type: '{type}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -364,8 +354,8 @@ choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -375,7 +365,9 @@ builders: - shell: - !include-raw-escape: include-raw-vpp-build.sh + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh - shell: !include-raw-escape: include-raw-vpp-csit-verify-perf.sh @@ -387,6 +379,9 @@ - robot-report: output-path: 'csit' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - parameter: name: type-parameter @@ -400,7 +395,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -416,6 +411,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -434,7 +431,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -452,12 +449,14 @@ fingerprint: false only-if-success: true default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' - job-template: name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -473,6 +472,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -507,7 +508,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -525,3 +526,212 @@ fingerprint: false only-if-success: true default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-make-test-docs-verify-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-4c-4g + 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: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + 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-patch-submitted: + 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-make-test-docs.sh + publishers: + - archive: + artifacts: 'build-root/test-doc/build/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-make-test-docs-merge-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-4c-4g + 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: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - reverse: + jobs: 'vpp-merge-{stream}-ubuntu1404' + 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 + + 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-make-test-docs.sh + publishers: + - archive: + artifacts: 'build-root/test-doc/build/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-test-packagecloud-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + 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}.{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-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'test-pkgcloud' + + + 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: + - include-raw-vpp-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' +