diff options
author | 2018-02-26 16:25:45 +0000 | |
---|---|---|
committer | 2018-02-26 16:25:45 +0000 | |
commit | 214cb2ffa873d73c5a7c4922849a22ae2a1f37d9 (patch) | |
tree | 65568cd309df11ae2abac773fba29d84e6ee524b /jjb | |
parent | 189dbee551cfaa4dbf89e57ee36ec8a7d5f3d7ed (diff) | |
parent | 6728866647025ff0eaf5cedfb5b054748e7b1922 (diff) |
Merge "VPP: This moves verify merge jobs to cpoc build"
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/vpp/vpp.yaml | 62 |
1 files changed, 51 insertions, 11 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 18015132e..c18412eee 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -60,7 +60,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' concurrent: true logrotate: @@ -100,6 +100,8 @@ - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: @@ -177,12 +179,16 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 - job-template: name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' logrotate: daysToKeep: '{build-days-to-keep}' @@ -240,6 +246,8 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: - ../scripts/setup_vpp_ubuntu_docker_test.sh - shell: @@ -355,12 +363,16 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 - job-template: name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: '{os}-basebuild-8c-32g' + node: '{os}-us' concurrent: true logrotate: @@ -426,6 +438,12 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 + + - job-template: name: 'vpp-csit-verify-os-virl-{stream}' @@ -601,7 +619,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-8c-32g + node: ubuntu1604-us concurrent: true logrotate: @@ -647,6 +665,8 @@ settings-file: 'vpp-settings' global-settings-file: 'global-settings' - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: include-raw-vpp-docs.sh publishers: - archive: @@ -657,12 +677,16 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 - job-template: name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-8c-32g + node: ubuntu1604-us concurrent: true logrotate: @@ -724,6 +748,8 @@ settings-file: 'vpp-settings' global-settings-file: 'global-settings' - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: include-raw-vpp-docs.sh publishers: - archive: @@ -734,12 +760,17 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 + - job-template: name: 'vpp-make-test-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-8c-32g + node: ubuntu1604-us concurrent: true logrotate: @@ -785,6 +816,8 @@ settings-file: 'vpp-settings' global-settings-file: 'global-settings' - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: include-raw-vpp-make-test-docs.sh publishers: - archive: @@ -795,12 +828,16 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 - job-template: name: 'vpp-make-test-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-basebuild-8c-32g + node: ubuntu1604-us concurrent: true logrotate: @@ -862,6 +899,8 @@ settings-file: 'vpp-settings' global-settings-file: 'global-settings' - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: !include-raw-escape: include-raw-vpp-make-test-docs.sh publishers: - archive: @@ -872,6 +911,10 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 - job-template: name: 'vpp-promote-{stream}-{os}' @@ -945,7 +988,7 @@ name: 'vpp-cpoc-verify-{stream}-{os}' project-type: freestyle - node: '{os}-s' + node: '{os}-us' concurrent: true logrotate: @@ -979,9 +1022,6 @@ name: '{project}' branch: '{branch}' comment-trigger-value: 'test-cpoc' - - gerrit-trigger-trivial-patch-submitted-skip-vote: - name: '{project}' - branch: '{branch}' builders: - shell: |