X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=406ae3aa37ab3d175b67367439b2739b470ad94d;hb=bc83e067c57170d2b202eada240fce0195da29ad;hp=3310efb93e9e35785697688dbb0891c0624ba949;hpb=2d286c0bfff820a47ba091d3952c6f3c6c7daa9d;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 3310efb93..406ae3aa3 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -28,6 +28,9 @@ - '1609': branch: 'stable/1609' repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1701' type: - short - long @@ -37,7 +40,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 +54,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 +68,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -87,10 +92,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -111,78 +112,14 @@ fingerprint: false only-if-success: true default-excludes: false - -- job-template: - name: 'vpp-csit-verify-virl-1604-test-{stream}' - - project-type: freestyle - node: 'verify-ubuntu1404' - 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: 'ubuntu1404' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'virl-1604-test' - 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: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-build.sh - publishers: - - archive: - artifacts: 'build-root/*.rpm,build-root/*.deb' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false + - 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: @@ -206,10 +143,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -237,11 +170,15 @@ - shell: !include-raw-escape: 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}' @@ -257,7 +194,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}' @@ -268,10 +207,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -281,17 +216,17 @@ 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: include-raw-vpp-build.sh - provide-maven-settings: settings-file: 'vpp-settings' global-settings-file: 'global-settings' @@ -306,12 +241,14 @@ 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: @@ -327,6 +264,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -335,10 +274,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -363,11 +298,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: @@ -385,6 +323,8 @@ os: '{os}' - type-parameter: type: '{type}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -393,12 +333,8 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -420,6 +356,9 @@ - robot-report: output-path: 'csit' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - parameter: name: type-parameter @@ -433,7 +372,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -449,6 +388,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -457,10 +398,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -471,7 +408,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -489,12 +426,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: @@ -510,6 +449,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -518,10 +459,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -548,7 +485,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -566,4 +503,5 @@ fingerprint: false only-if-success: true default-excludes: false - + - fdio-infra-shiplogs: + maven-version: 'mvn33-new'