X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=c5272681bf5354fa2da164ac764f9e19a195b445;hb=45d7e007445577b416b70775e5daf5c9a65103fa;hp=95dd949248508b5cdbd7e1d1b107ecabfe00914e;hpb=12aaa555f3ac661c70016e6d8f2336b5aa62c928;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 95dd94924..c5272681b 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -3,10 +3,7 @@ name: vpp jobs: - 'vpp-verify-{stream}-{os}' - - 'vpp-verify-{stream}-clang' - 'vpp-merge-{stream}-{os}' - - 'vpp-verify-os-{stream}-{os}' - - 'vpp-merge-os-{stream}-{os}' - 'vpp-docs-merge-{stream}' - 'vpp-docs-verify-{stream}' - 'vpp-make-test-docs-merge-{stream}' @@ -25,9 +22,6 @@ - master: branch: 'master' repo-stream-part: 'master' - - '1710': - branch: 'stable/1710' - repo-stream-part: 'stable.1710' - '1801': branch: 'stable/1801' repo-stream-part: 'stable.1801' @@ -38,11 +32,29 @@ - short - long +- project: + name: vpp-clang + jobs: + - 'vpp-verify-{stream}-clang' + + project: 'vpp' + os: + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + - centos7: + repo-os-part: 'centos7' + - opensuse: + repo-os-part: 'opensuse' + + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + - project: name: vpp-misc jobs: - 'vpp-csit-verify-virl-{stream}' - - 'vpp-csit-verify-os-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}' - 'vpp-checkstyle-verify-{stream}' project: 'vpp' @@ -50,9 +62,6 @@ - master: branch: 'master' repo-stream-part: 'master' - - '1710': - branch: 'stable/1710' - repo-stream-part: 'stable.1710' - '1801': branch: 'stable/1801' repo-stream-part: 'stable.1801' @@ -62,7 +71,7 @@ os: ubuntu1604 - project: - name: vpp-beta + name: vpp-master-only jobs: - 'vpp-beta-verify-{stream}-{os}' project: 'vpp' @@ -91,7 +100,7 @@ repo-stream-part: 'stable.1804' os: - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' + repo-os-part: 'ubuntu-arm.xenial.main' - job-template: name: 'vpp-beta-verify-{stream}-{os}' @@ -166,7 +175,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -204,22 +213,10 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'armcheck' - - 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}' - 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}' + builders: - shell: !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh @@ -238,7 +235,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -281,30 +278,19 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'armmerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - 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-patch-merged: + name: '{project}' + branch: '{branch}' builders: - config-file-provider: files: - file-id: '.packagecloud' - target: '/home/jenkins' + target: '/root' - config-file-provider: files: - file-id: 'packagecloud_api' - target: '/home/jenkins' + target: '/root' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -339,7 +325,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -475,7 +461,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 2 fixed-delay: 90 @@ -529,71 +515,10 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 -- job-template: - name: 'vpp-verify-os-{stream}-{os}' - - project-type: freestyle - node: '{os}-basebuild-8c-32g' - 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}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - - 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-os-trivial-patch-submitted: - name: '{project}' - branch: '{branch}' - - builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - 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_dpdk_dev_env.sh - - include-raw-vpp-build.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' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - - job-template: name: 'vpp-merge-{stream}-{os}' @@ -641,11 +566,11 @@ - config-file-provider: files: - file-id: '.packagecloud' - target: '/home/jenkins' + target: '/root' - config-file-provider: files: - file-id: 'packagecloud_api' - target: '/home/jenkins' + target: '/root' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -682,99 +607,10 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 -- job-template: - name: 'vpp-merge-os-{stream}-{os}' - - project-type: freestyle - node: '{os}-basebuild-8c-32g' - - 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}' - - 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-os-patch-merged: - name: '{project}' - branch: '{branch}' - - builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/home/jenkins' - - 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: include-raw-vpp-checkstyle.sh - - 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' - - job-template: name: 'vpp-csit-verify-virl-{stream}' @@ -846,81 +682,10 @@ maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 - -- job-template: - name: 'vpp-csit-verify-os-virl-{stream}' - - project-type: freestyle - node: '{os}-basebuild-8c-32g' - 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}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.xenial.main' - - is-csit-vpp-job-parameter: - is-csit-vpp-job: 'True' - - string: - name: CSIT_REF - description: "Also testing CSIT_REF" - - 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-os-trivial-patch-submitted: - name: '{project}' - branch: '{branch}' - - builders: - - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop' - - inject: - properties-file: variables.prop - - shell: - !include-raw-escape: - - include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_docker_test.sh - - ../scripts/setup_vpp_dpdk_dev_env.sh - - 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' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - job-template: name: 'vpp-csit-verify-hw-perf-{stream}' @@ -1085,7 +850,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1168,7 +933,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1236,7 +1001,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1319,7 +1084,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90