diff options
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 2 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 158 |
2 files changed, 158 insertions, 2 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index aa8ebbe3d..5c45f6e26 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -50,7 +50,6 @@ project: 'csit' executor: 'ubuntu1804-us' - ligato-executor: 'ubuntu1804-basebuild-4c-4g' branch: 'master' branch-id: 'oper' vpp-mrr-daily-periodicity: '0 14 * * 1,4' @@ -80,7 +79,6 @@ - 3n-dnv - 3n-tsh: executor: 'ubuntu1804arm-us' - ligato-executor: 'ubuntu1804arm-us' - job-template: name: 'csit-vpp-perf-verify-{stream}-{node-arch}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 1b08c06f0..fd4afb0a9 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -25,6 +25,23 @@ - '2001': branch: 'stable/2001' repo-stream-part: 'stable.2001' +- project: + name: vpp-beta + jobs: + - 'vpp-beta-verify-{stream}-{os}' + - 'vpp-beta-merge-{stream}-{os}' + + project: 'vpp' + os: + - ubuntu2004: + repo-os-part: 'ubuntu.focal.main' + - centos8: + repo-os-part: 'centos8' + + stream: + - master: + branch: 'master' + repo-stream-part: 'master' - project: name: vpp-clang @@ -581,6 +598,67 @@ fixed-delay: 90 - job-template: + name: 'vpp-beta-verify-{stream}-{os}' + + project-type: freestyle + node: '{os}-us' + concurrent: true + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + 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}' + - stream-parameter: + stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: 120 + + triggers: + - gerrit-trigger-manually-triggered: + comment-trigger-value: 'betacheck' + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/build.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn36' + +- job-template: name: 'vpp-verify-{stream}-{os}' project-type: freestyle @@ -887,6 +965,86 @@ fixed-delay: 90 - job-template: + name: 'vpp-beta-merge-{stream}-{os}' + + project-type: freestyle + node: '{os}-us' + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + 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}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-manually-triggered: + comment-trigger-value: 'betamerge' + name: '{project}' + branch: '{branch}' + + builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root' + - shell: + !include-raw-escape: + - ../scripts/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 + - shell: + !include-raw-escape: + - ../scripts/vpp/build.sh + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn36' + +- job-template: name: 'vpp-csit-verify-device-{stream}-{device-node-arch}' description: | <ul> |