X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=730ab847d48857315eb1c7fe33c319715f425a0a;hb=f70812d21015a503067ff6f9e2d3a3802dbeac63;hp=58180af9035957905c755730e0d0919085413092;hpb=ab26b793f48ea8f583047af6a64df5568ec57cf0;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 58180af90..730ab847d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -2,7 +2,6 @@ name: vpp jobs: - 'vpp-verify-{stream}-{os}' - - 'vpp-verify-{stream}-{os}-clang' - 'vpp-merge-{stream}-{os}' - 'vpp-verify-image-{stream}-{os}' - 'vpp-docs-merge-{stream}' @@ -29,6 +28,9 @@ - '1609': branch: 'stable/1609' repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1701' type: - short - long @@ -38,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: @@ -53,6 +54,9 @@ - '1609': branch: 'stable/1609' repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1609' os: ubuntu1604 type: @@ -64,7 +68,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -109,113 +113,11 @@ only-if-success: true default-excludes: false -- job-template: - name: 'vpp-verify-{stream}-{os}-clang' - - project-type: freestyle - node: 'verify-{os}' - 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}' - - 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-clang-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-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: '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: 'virl-1604-test' - - builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-build.sh - - shell: - !include-raw-escape: include-raw-vpp-csit-functional.sh - - publishers: - - archive-artifacts: - artifacts: 'csit/report.html, csit/log.html, csit/output.xml' - latest-only: false - - - robot-report: - output-path: 'csit' - - job-template: name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle - node: 'verify-image-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -270,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}' @@ -286,7 +188,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}' @@ -311,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 @@ -336,7 +240,7 @@ name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -352,6 +256,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -388,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: @@ -406,6 +312,8 @@ os: '{os}' - type-parameter: type: '{type}' + - is-csit-vpp-job-parameter: + is-csit-vpp-job: 'True' scm: - gerrit-trigger-scm: @@ -450,7 +358,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -466,6 +374,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -484,7 +394,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -507,7 +417,7 @@ name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -523,6 +433,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -557,7 +469,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp