X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=7b481d93edce6bafcd61a10f835c5f484364970b;hb=8ffdecd4d58a77c3b7c3ca38edebab1ace262935;hp=6b9f2d6de982689f8aa5151e904941208c43e004;hpb=0f7d85ebf0eba038a0a3c4676e4eb164b683ed2d;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 6b9f2d6de..7b481d93e 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -9,13 +9,16 @@ - 'vpp-make-test-docs-merge-{stream}' - 'vpp-make-test-docs-verify-{stream}' - 'vpp-test-packagecloud-{stream}-{os}' + - 'vpp-promote-{stream}-{os}' + - 'vpp-test-poc-verify-{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' @@ -38,6 +41,9 @@ - '1707': branch: 'stable/1707' repo-stream-part: 'stable.1707' + - '1710': + branch: 'stable/1710' + repo-stream-part: 'stable.1710' type: - short - long @@ -70,6 +76,9 @@ - '1707': branch: 'stable/1707' repo-stream-part: 'stable.1707' + - '1710': + branch: 'stable/1710' + repo-stream-part: 'stable.1710' os: ubuntu1604 @@ -77,7 +86,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: true logrotate: @@ -129,12 +138,13 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - job-template: name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: true logrotate: @@ -197,7 +207,7 @@ name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' logrotate: daysToKeep: '{build-days-to-keep}' @@ -241,6 +251,10 @@ files: - file-id: '.packagecloud' target: '/home/jenkins' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/home/jenkins' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -279,7 +293,7 @@ name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: true logrotate: @@ -342,7 +356,7 @@ name: 'vpp-csit-verify-hw-perf-{stream}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: false logrotate: @@ -391,6 +405,8 @@ comment-contains-value: 'vpp-verify-perf-vhost' - comment-added-contains-event: comment-contains-value: 'vpp-verify-perf-acl' + - comment-added-contains-event: + comment-contains-value: 'vpp-verify-perf-memif' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -436,7 +452,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1604-basebuild-8c-32g concurrent: true logrotate: @@ -497,7 +513,7 @@ name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1604-basebuild-8c-32g concurrent: true logrotate: @@ -574,7 +590,7 @@ name: 'vpp-make-test-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1604-basebuild-8c-32g concurrent: true logrotate: @@ -635,7 +651,7 @@ name: 'vpp-make-test-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1604-basebuild-8c-32g concurrent: true logrotate: @@ -712,7 +728,7 @@ name: 'vpp-test-packagecloud-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-4c-4g' + node: '{os}-basebuild-8c-32g' concurrent: true logrotate: @@ -777,3 +793,127 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-promote-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-8c-32g' + + 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}' + - 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' + + 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' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/home/jenkins' + - 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_promote.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-test-poc-verify-{stream}-{os}' + + project-type: freestyle + node: 'ubuntu-s' + 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-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 + - 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,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/*/*' + - retry-build-on-builder-error