X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=b8b45fc9846043b0ab0e7ea51e017846ead862e9;hb=e245a092d54dcaa9cee1eee9cea34a239adeea36;hp=7b481d93edce6bafcd61a10f835c5f484364970b;hpb=9dfec875c6729279c53f8993330e8c8bd294d7b1;p=ci-management.git diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 7b481d93e..b8b45fc98 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,16 +1,15 @@ +--- - project: name: vpp jobs: - 'vpp-verify-{stream}-{os}' - 'vpp-merge-{stream}-{os}' - - 'vpp-verify-image-{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 +17,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 @@ -58,27 +44,12 @@ - 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 +87,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-trivial-patch-submitted: name: '{project}' branch: '{branch}' @@ -140,69 +111,6 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' -- job-template: - name: 'vpp-verify-image-{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: - 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 - - builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.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' - - job-template: name: 'vpp-merge-{stream}-{os}' @@ -330,11 +238,15 @@ 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 +319,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 +334,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 @@ -724,76 +641,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}' @@ -860,10 +707,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 +740,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 +755,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 +767,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 + +