diff options
-rw-r--r-- | jjb/vpp/vpp.yaml | 117 |
1 files changed, 95 insertions, 22 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 9a799550d..486227095 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -72,6 +72,7 @@ name: vpp-master-only jobs: - 'vpp-beta-verify-{stream}-{os}' + - 'vpp-beta-merge-{stream}-{os}' project: 'vpp' stream: - master: @@ -105,28 +106,9 @@ node: '{os}-us' concurrent: true triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - patchset-uploaded-event: 'false' - - comment-added-contains-event: - comment-contains-value: 'betacheck' - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - 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 - override-votes: true - gerrit-build-notbuilt-verified-value: 0 - notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.' + - gerrit-trigger-trivial-patch-submitted: + name: '{project}' + branch: '{branch}' logrotate: daysToKeep: '{build-days-to-keep}' @@ -159,6 +141,7 @@ !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh - include-raw-vpp-build.sh publishers: - archive: @@ -176,6 +159,96 @@ fixed-delay: 90 - job-template: + name: 'vpp-beta-merge-{stream}-{os}' + + project-type: freestyle + node: '{os}-us' + + logrotate: + 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: '{build-timeout}' + + 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_docker_test.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' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + - 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' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 + +- job-template: name: 'vpp-arm-verify-{stream}-{os}' project-type: freestyle |