- master:
branch: 'master'
repo-stream-part: 'master'
- - '1801':
- branch: 'stable/1801'
- repo-stream-part: 'stable.1801'
- - '1804':
- branch: 'stable/1804'
- repo-stream-part: 'stable.1804'
- - '1807':
- branch: 'stable/1807'
- repo-stream-part: 'stable.1807'
- '1810':
branch: 'stable/1810'
repo-stream-part: 'stable.1810'
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
+ - '1904':
+ branch: 'stable/1904'
+ repo-stream-part: 'stable.1904'
- project:
name: vpp-clang
- project:
name: vpp-misc
jobs:
- - 'vpp-csit-verify-virl-{stream}'
- 'vpp-checkstyle-verify-{stream}'
project: 'vpp'
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
- - '1801':
- branch: 'stable/1801'
- repo-stream-part: 'stable.1801'
- - '1804':
- branch: 'stable/1804'
- repo-stream-part: 'stable.1804'
- - '1807':
- branch: 'stable/1807'
- repo-stream-part: 'stable.1807'
- '1810':
branch: 'stable/1810'
repo-stream-part: 'stable.1810'
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
+ - '1904':
+ branch: 'stable/1904'
+ repo-stream-part: 'stable.1904'
os: ubuntu1604
- project:
name: vpp-perpatch
jobs:
- - 'vpp-csit-verify-perf-{stream}-2n-skx'
+ - 'vpp-csit-verify-device-{stream}-1n-skx'
+ - 'vpp-csit-verify-perf-{stream}-{node-arch}'
project: 'vpp'
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
- os: ubuntu1604
+ os: ubuntu1804
+ node-arch:
+ - 2n-skx
+ - 3n-skx
+ - 3n-hsw
- project:
name: vpp-master-only
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
+ - '1904':
+ branch: 'stable/1904'
+ repo-stream-part: 'stable.1904'
os:
- ubuntu1804:
repo-os-part: 'ubuntu.bionic.main'
- '1901':
branch: 'stable/1901'
repo-stream-part: 'stable.1901'
+ - '1904':
+ branch: 'stable/1904'
+ repo-stream-part: 'stable.1904'
os:
- ubuntu1804:
repo-os-part: 'ubuntu-arm.bionic.main'
- 'vpp-arm-old-merge-{stream}-{os}'
project: 'vpp'
stream:
- - '1804':
- branch: 'stable/1804'
- repo-stream-part: 'stable.1804'
- - '1807':
- branch: 'stable/1807'
- repo-stream-part: 'stable.1807'
- '1810':
branch: 'stable/1810'
repo-stream-part: 'stable.1810'
- ubuntu1604:
repo-os-part: 'ubuntu-arm.xenial.main'
+- project:
+ name: vpp-view
+ views:
+ - project-view
+ project-name: vpp
+
- job-template:
name: 'vpp-beta-verify-{stream}-{os}'
fixed-delay: 90
- job-template:
- name: 'vpp-csit-verify-virl-{stream}'
+ name: 'vpp-csit-verify-device-{stream}-1n-skx'
project-type: freestyle
- node: '{os}-us'
+ node: 'vpp-csit-device'
concurrent: true
build-discarder:
- 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"
+ repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+ - gerrit-refspec-parameter
+ - gerrit-event-type-parameter
+ - gerrit-event-comment-text-parameter
+ - gerrit-csit-refspec-parameter
- stream-parameter:
stream: '{stream}'
build-timeout: '90'
triggers:
- - gerrit-trigger-csit-virltest:
+ - gerrit-trigger-csit-devicetest:
name: '{project}'
branch: '{branch}'
builders:
- - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
- - inject:
- properties-file: variables.prop
- shell:
- !include-raw-escape:
- - ../scripts/setup_vpp_ubuntu_docker_test.sh
- - ../scripts/setup_vpp_dpdk_dev_env.sh
- - include-raw-vpp-build.sh
+ !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
!include-raw-escape:
- - include-raw-vpp-csit-functional.sh
+ - include-raw-vpp-csit-device.sh
+
publishers:
- archive-artifacts:
artifacts: >
- **/csit/report.html,
- **/csit/log.html,
- **/csit/output.xml
+ **/csit_current/**/*.*
latest-only: false
- robot-report:
- output-path: 'csit'
+ output-path: 'csit_current/'
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- job-template:
- name: 'vpp-csit-verify-perf-{stream}-2n-skx'
+ name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
project-type: freestyle
- node: '{os}-basebuild-8c-32g'
+ node: '{os}-us'
concurrent: true
build-discarder:
- gerrit-csit-refspec-parameter
- string:
name: CSIT_PERF_TRIAL_DURATION
- default: "1.0"
+ default: "10.0"
description: "Duration of a trial measurement in BMRR tests."
- string:
name: CSIT_PERF_TRIAL_MULTIPLICITY
- default: "8"
+ default: "5"
description: "Number of subsamples for BMRR tests."
- stream-parameter:
stream: '{stream}'
- gerrit-trigger-csit-perftest:
name: '{project}'
branch: '{branch}'
+ node-arch: '{node-arch}'
builders:
+ - shell:
+ !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
- shell:
!include-raw-escape:
- - clone-csit-run-main.sh
+ - include-raw-vpp-csit-perf.sh
publishers:
- archive-artifacts:
artifacts: >
- **/csit_new/**/*.*,
+ **/csit_current/**/*.*,
**/csit_parent/**/*.*
latest-only: false
- robot-report:
- output-path: 'csit_new/0/'
+ output-path: 'csit_current/0/'
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'