X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=18015132ef20b28245976794516a885e594a8f8f;hb=98df54e7595d1264e073eb65e53ebd14d5227755;hp=7b481d93edce6bafcd61a10f835c5f484364970b;hpb=8ffdecd4d58a77c3b7c3ca38edebab1ace262935;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 7b481d93e..18015132e 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,16 +1,17 @@ +--- - project: name: vpp jobs: - 'vpp-verify-{stream}-{os}' - 'vpp-merge-{stream}-{os}' - - 'vpp-verify-image-{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}' - 'vpp-make-test-docs-verify-{stream}' - - 'vpp-test-packagecloud-{stream}-{os}' - 'vpp-promote-{stream}-{os}' - - 'vpp-test-poc-verify-{stream}-{os}' + - 'vpp-cpoc-verify-{stream}-{os}' project: 'vpp' os: @@ -18,32 +19,19 @@ repo-os-part: 'ubuntu.xenial.main' - centos7: repo-os-part: 'centos7' + - opensuse: + repo-os-part: 'opensuse' stream: - master: branch: 'master' repo-stream-part: 'master' - - test: - branch: 'stable/test' - repo-stream-part: 'stable.test' - - '1606': - branch: 'stable/1606' - repo-stream-part: 'stable.1606' - - '1609': - branch: 'stable/1609' - repo-stream-part: 'stable.1609' - - '1701': - branch: 'stable/1701' - repo-stream-part: 'stable.1701' - - '1704': - branch: 'stable/1704' - repo-stream-part: 'stable.1704' - - '1707': - branch: 'stable/1707' - repo-stream-part: 'stable.1707' - '1710': branch: 'stable/1710' repo-stream-part: 'stable.1710' + - '1801': + branch: 'stable/1801' + repo-stream-part: 'stable.1801' type: - short - long @@ -52,33 +40,19 @@ name: vpp-misc jobs: - 'vpp-csit-verify-virl-{stream}' + - 'vpp-csit-verify-os-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}' project: 'vpp' stream: - master: branch: 'master' repo-stream-part: 'master' - - test: - branch: 'stable/test' - repo-stream-part: 'stable.test' - - '1606': - branch: 'stable/1606' - repo-stream-part: 'stable.1606' - - '1609': - branch: 'stable/1609' - repo-stream-part: 'stable.1609' - - '1701': - branch: 'stable/1701' - repo-stream-part: 'stable.1609' - - '1704': - branch: 'stable/1704' - repo-stream-part: 'stable.1704' - - '1707': - branch: 'stable/1707' - repo-stream-part: 'stable.1707' - '1710': branch: 'stable/1710' repo-stream-part: 'stable.1710' + - '1801': + branch: 'stable/1801' + repo-stream-part: 'stable.1801' os: ubuntu1604 @@ -116,7 +90,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-trivial-patch-submitted: name: '{project}' branch: '{branch}' @@ -125,6 +99,9 @@ !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 @@ -141,7 +118,7 @@ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - job-template: - name: 'vpp-verify-image-{stream}-{os}' + name: 'vpp-verify-os-{stream}-{os}' project-type: freestyle node: '{os}-basebuild-8c-32g' @@ -174,34 +151,32 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-images' - 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 + - 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: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - 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}' @@ -264,6 +239,98 @@ 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-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 @@ -313,6 +380,79 @@ 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-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-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: @@ -325,16 +465,20 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - 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: @@ -407,6 +551,8 @@ comment-contains-value: 'vpp-verify-perf-acl' - comment-added-contains-event: comment-contains-value: 'vpp-verify-perf-memif' + - comment-added-contains-event: + comment-contains-value: 'vpp-verify-perf-ipsechw' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -420,6 +566,9 @@ notbuilt: false builders: + - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh @@ -482,7 +631,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-trivial-patch-submitted: name: '{project}' branch: '{branch}' @@ -620,7 +769,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-trivial-patch-submitted: name: '{project}' branch: '{branch}' @@ -724,76 +873,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' -- job-template: - name: 'vpp-test-packagecloud-{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}' - - 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: '$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: 'test-pkgcloud' - - - builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - #variable: 'SETTINGS_FILE' - - 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_dpdk_dev_env.sh - - include-raw-vpp-build.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-promote-{stream}-{os}' @@ -847,6 +926,9 @@ !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 @@ -860,10 +942,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'vpp-test-poc-verify-{stream}-{os}' + name: 'vpp-cpoc-verify-{stream}-{os}' project-type: freestyle - node: 'ubuntu-s' + node: '{os}-s' concurrent: true logrotate: @@ -893,7 +975,11 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'test-cpoc' + - gerrit-trigger-trivial-patch-submitted-skip-vote: name: '{project}' branch: '{branch}' @@ -904,6 +990,7 @@ !include-raw-escape: include-raw-vpp-test-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 publishers: @@ -915,5 +1002,10 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' - - retry-build-on-builder-error + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: true + max-failed-builds: 1 + fixed-delay: 10 + +