X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=730ab847d48857315eb1c7fe33c319715f425a0a;hb=1509387215f5560b7e3e16ca54de7871c9ef4e53;hp=5c0f57bbc35ab20595cd2c0ceedcaf35e95e27d7;hpb=ddae95ebd3ebc2927c57c7ba76c869be3e345dbf;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5c0f57bbc..730ab847d 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: @@ -82,15 +87,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -112,77 +113,11 @@ 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: '{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 - - job-template: name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle - node: 'verify-image-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -201,15 +136,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -241,7 +172,7 @@ name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: 'merge-{os}' + node: '{os}-basebuild-4c-4g' logrotate: daysToKeep: '{build-days-to-keep}' @@ -257,21 +188,19 @@ - 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}' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -286,7 +215,7 @@ - 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 @@ -311,7 +240,7 @@ name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -327,18 +256,16 @@ branch: '{branch}' - os-parameter: os: '{os}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -367,7 +294,7 @@ name: 'vpp-csit-verify-hw-perf-{stream}-{type}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: false logrotate: @@ -385,20 +312,18 @@ os: '{os}' - type-parameter: type: '{type}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -433,7 +358,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -449,18 +374,16 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -471,7 +394,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -494,7 +417,7 @@ name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -510,18 +433,16 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -548,7 +469,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -566,4 +487,3 @@ fingerprint: false only-if-success: true default-excludes: false -