X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=d4f7b658e2eeb473004e1facfbeab87bd94af1fb;hb=8224b8404da42b47dcd9a3698f7e215264a23e43;hp=01d0d9d751db0f293983c162ce5ba7bfb6dc8ee1;hpb=2cd9a2a6c5fb0e9baeeb329c6ccb1901dadaebda;p=ci-management.git
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 01d0d9d75..d4f7b658e 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Copyright (c) 2019 PANTHEON.tech s.r.o. and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,72 +18,89 @@
description: 'CSIT Jenkins jobs.'
jobs:
- - 'csit-vpp-perf-verify-{stream}-{node-arch}'
- - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+ - 'csit-dpdk-perf-verify-{stream}-{node-arch}':
+ node-arch:
+ - 2n-clx
+ - 2n-skx
+ - 2n-dnv
+ - 3n-skx
+ - 3n-hsw
+ - 3n-dnv
+ - 3n-tsh:
+ executor: 'ubuntu1804arm-us'
+ - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
node-arch:
- ''
- -2n-clx
- -2n-skx
- - -2n-dnv
- -3n-skx
- - -3n-dnv
+ periodicity: '0 0 * * 6'
+ - 'csit-vpp-perf-verify-{stream}-{node-arch}':
+ node-arch:
+ - 2n-clx
+ - 2n-skx
+ - 2n-dnv
+ - 3n-skx
+ - 3n-hsw
+ - 3n-dnv
+ - 3n-tsh:
+ executor: 'ubuntu1804arm-us'
+ - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+ node-arch:
+ - '':
+ periodicity: '0 14 * * *'
+ - -2n-clx:
+ periodicity: '0 14 * * *'
+ - -2n-skx:
+ periodicity: '0 14 * * 1,4'
+ - -2n-dnv:
+ periodicity: '0 14 * * *'
+ - -3n-skx:
+ periodicity: '0 14 * * 1,4'
+ - -3n-dnv:
+ periodicity: '0 14 * * *'
- -3n-tsh:
executor: 'ubuntu1804arm-us'
- vpp-mrr-daily-periodicity: '0 16 * * 6'
- - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
+ periodicity: '0 14 * * *'
+ - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
node-arch:
- 2n-clx
- 2n-skx
+ - 3n-skx
+ stream:
+ - master:
+ branch: 'master'
+ branch-id: 'oper'
+ - '1908':
+ branch: 'rls1908'
+ branch-id: 'oper-rls1908'
+ periodicity: '0 0 * * 6'
- 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
node-arch:
- 2n-clx
- 2n-skx
- 3n-skx
- 3n-hsw
- - 'csit-dpdk-perf-verify-{stream}-{node-arch}'
- - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
- node-arch:
- - ''
- - -2n-clx
- - -2n-skx
- - -3n-skx
- - 'csit-ligato-perf-verify-{stream}-{node-arch}'
+ periodicity: '0 0 * * 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'
+ csit-perf-trial-duration: "1.0"
+ csit-perf-trial-multiplicity: "10"
stream:
- master:
branch: 'master'
branch-id: 'oper'
- executor: 'ubuntu1804-us'
- - '1901':
- branch: 'rls1901'
- branch-id: 'oper-rls1901'
- executor: 'ubuntu1604-basebuild-8c-32g'
- - '1904':
- branch: 'rls1904'
- branch-id: 'oper-rls1904'
- executor: 'ubuntu1804-us'
- - '1908':
- branch: 'rls1908'
- branch-id: 'oper-rls1908'
- executor: 'ubuntu1804-us'
-
+ - '1908_1':
+ branch: 'rls1908_1'
+ branch-id: 'oper-rls1908_1'
+ - '2001':
+ branch: 'rls2001'
+ branch-id: 'oper-rls2001'
build-artifact-num-to-keep: 10
- node-arch:
- - 2n-clx
- - 2n-skx
- - 2n-dnv
- - 3n-skx
- - 3n-hsw
- - 3n-dnv
- - 3n-tsh:
- executor: 'ubuntu1804arm-us'
- ligato-executor: 'ubuntu1804arm-us'
+
- job-template:
name: 'csit-vpp-perf-verify-{stream}-{node-arch}'
@@ -100,6 +117,10 @@
trigger: keyword in comment to csit patch:
csit-{node-arch}-perftest tag_list
+ executor
+
perf test-cases selection
- test-cases selected using trigger keyword followed by tags
@@ -147,10 +168,19 @@
- gerrit-refspec-parameter
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "{csit-perf-trial-duration}"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
+ # This is a manually-triggered verify job, part of API coverage.
+ # CRC checking is needed to ensure vpp crc job breaks only when intended.
+ # Can be removed when this job is no longer needed for full API coverage.
+ - csit-fail-on-crc-mismatch-parameter:
+ fail-on-crc-mismatch: 'True'
scm:
- gerrit-trigger-scm:
@@ -163,26 +193,16 @@
build-timeout: '{build-timeout}'
triggers:
- - gerrit:
- server-name: 'Primary'
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: 'csit-{node-arch}-perftest'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- skip-vote:
- successful: false
- failed: false
- unstable: false
- notbuilt: false
+ - gerrit-trigger-csit-perftest:
+ project: '{project}'
+ branch: '{branch}'
+ trigger-word: 'csit-{node-arch}-perftest'
+ skip-vote: false
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-verify.sh
publishers:
- robot:
@@ -202,6 +222,10 @@
+
- executor
+
- perf test-cases selection
- all CSIT VPP MRR perf suites
@@ -231,6 +255,10 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "{csit-perf-trial-duration}"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
@@ -241,14 +269,15 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '{vpp-mrr-daily-periodicity}'
+ - timed: '{periodicity}'
builders:
- shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
@@ -260,7 +289,7 @@
maven-version: 'mvn33-new'
- job-template:
- name: 'csit-vpp-perf-mrr-weekly-master-{node-arch}'
+ name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
description: |
@@ -268,6 +297,10 @@
- check vpp perf mrr weekly on {node-arch}
+ - executor
+
- perf test-cases selection
- NF Density CSIT VPP MRR perf suites
@@ -297,6 +330,10 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "{csit-perf-trial-duration}"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
@@ -307,14 +344,15 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 0 * * 6'
+ - timed: '{periodicity}'
builders:
- shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
@@ -334,6 +372,10 @@
- check vpp perf ndrpdr weekly on {node-arch}
+ - executor
+
- perf test-cases selection
- pre-selected CSIT VPP NDRPDR perf suites
@@ -372,14 +414,15 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 0 * * 6'
+ - timed: '{periodicity}'
builders:
- shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
@@ -405,6 +448,10 @@
- trigger: keyword in comment to csit patch:
csit-dpdk-{node-arch}-perftest tag_list
+ - executor
+
- perf test-cases selection
- test-cases selected using trigger keyword followed by tags
@@ -444,6 +491,10 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "{csit-perf-trial-duration}"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
@@ -479,7 +530,8 @@
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-verify.sh
publishers:
- robot:
@@ -499,6 +551,10 @@
- check dpdk perf mrr weekly
+ - executor
+
- perf test-cases selection
- all CSIT DPDK MRR perf suites
@@ -528,6 +584,10 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "{csit-perf-trial-duration}"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
@@ -538,14 +598,15 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 0 * * 6'
+ - timed: '{periodicity}'
builders:
- shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
@@ -555,117 +616,3 @@
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
-
-- job-template:
- name: 'csit-ligato-perf-verify-{stream}-{node-arch}'
-
- # yamllint disable rule:line-length
- description: |
-
- - objective
-
- - perf verify - per csit gerrit patch
-
- - job
-
- - name: csit-ligato-perf-verify-{stream}-{node-arch}
-
- trigger: keyword in comment to csit patch:
- csit--ligato-{node-arch}-perftest tag_list
-
- - perf test-cases selection
-
- - test-cases selected using trigger keyword followed by tags
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - proposed keywords
-
- - focus on testing specified Kubernetes orchestrated topologies
-
- format: csit-ligato-{node-arch}-perftest tag_list
-
- - default tags for vpp startup config and perf test type
-
- - IP4BASE, IP6BASE, L2BDBASE
-
- 64B/78B: 64B/78B packet size
-
- 1C: one core
-
- X710: x710 Fortville NIC
-
- MRR: MRR throughput
-
- - results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
- # yamllint enable rule:line-length
-
- project-type: freestyle
- # As the nomad executors are running docker containers we cannot run
- # ligato-perf job due to dependency on using docker inside.
- # TODO: Find the mechanics how to offload job logic from compiling docker
- # image so we can move this executor to ubuntu1804-us
- node: '{ligato-executor}'
- concurrent: true
- archive-artifacts: 'archive/*.*'
- latest-only: false
-
- build-discarder:
- 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}'
- - gerrit-refspec-parameter
- - gerrit-event-type-parameter
- - gerrit-event-comment-text-parameter
- - 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-non-activity-timeout:
- build-timeout: '{build-timeout}'
-
- triggers:
- - gerrit:
- server-name: 'Primary'
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: 'csit-ligato-{node-arch}-perftest'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- skip-vote:
- successful: false
- failed: false
- unstable: false
- notbuilt: false
-
- builders:
- - shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
-
- publishers:
- - robot:
- output-path: archive
- other-files:
- - '*.*'
-
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'