summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/csit/csit.yaml1066
-rw-r--r--jjb/csit/include-raw-csit-vpp-perf-check.sh20
-rw-r--r--jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh54
-rw-r--r--jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh54
-rw-r--r--jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh54
-rw-r--r--jjb/csit/include-raw-csit-vpp-perf-verify.sh20
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh3
-rw-r--r--jjb/scripts/packagecloud_push.sh20
-rw-r--r--jjb/vpp/include-raw-vpp-packagecloud-push.sh15
-rw-r--r--jjb/vpp/vpp.yaml15
10 files changed, 1297 insertions, 24 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 92b4d00a6..69b48af2d 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -12,9 +12,14 @@
- 'csit-vpp-verify-{stream_timed}-{os}-weekly'
- 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
- 'csit-vpp-verify-perf-master-nightly-all'
- - 'csit-docs-merge-{stream}'
+ - 'csit-docs-merge-{stream_timed}'
- 'csit-docs-verify-{stream}'
- 'csit-report-merge-{stream}'
+ - 'csit-vpp-perf-trend-daily-master'
+ - 'csit-vpp-perf-trend-semi-weekly-master'
+ - 'csit-vpp-perf-check-{stream}'
+ - 'csit-vpp-perf-ndrchk-daily-master'
+ - 'csit-vpp-perf-verify-{stream}'
project: 'csit'
branch: 'master'
@@ -27,9 +32,9 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '1701':
- branch: 'rls1701'
- branch-id: 'oper-rls1701'
+ - '1704':
+ branch: 'rls1704'
+ branch-id: 'oper-rls1704'
stream:
- master:
branch: 'master'
@@ -43,6 +48,9 @@
- '1701':
branch: 'rls1701'
branch-id: 'oper-rls1701'
+ - '1704':
+ branch: 'rls1704'
+ branch-id: 'oper-rls1704'
- job-template:
@@ -2478,7 +2486,7 @@
maven-version: 'mvn33-new'
- job-template:
- name: 'csit-docs-merge-{stream}'
+ name: 'csit-docs-merge-{stream_timed}'
project-type: freestyle
node: 'ubuntu1604-basebuild-4c-4g'
@@ -2512,7 +2520,7 @@
triggers:
- reverse:
- jobs: 'csit-vpp-verify-{stream}-weekly'
+ jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly'
result: 'success'
- gerrit:
server-name: 'Primary'
@@ -2632,6 +2640,1052 @@
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
+- job-template:
+ name: 'csit-vpp-perf-trend-daily-master'
+
+ description: |
+ Purpose of this job is to validate latest vpp build from corresponding
+ branch stored in nexus against verified CSIT codebase of corresponding
+ branch.
+
+ objective
+ daily perf trending of vpp master build
+ job
+ name
+ csit-vpp-perf-trend-daily
+ trigger
+ scheduled daily
+ perf test-cases selection
+ all CSIT perf suites
+ default tags for vpp startup config and perf test type
+ 1T1C - one worker thread, one core
+ 2T2C - two worker threads, two cores
+ X520 - Intel x520-DA2 NIC
+ NDRDISC - discovery of NDR throughput
+ results
+ jjb verify - no
+ present
+ jenkins trending graphs
+
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-4c-4g'
+ concurrent: false
+
+ 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}'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: '1440'
+
+ triggers:
+ - timed: 'H H(20-23) * * *'
+
+ builders:
+ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+ - inject:
+ properties-file: variables.prop
+ - shell:
+ !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'csit/archive/*.*'
+ latest-only: false
+
+ - robot-report:
+ output-path: 'csit/archive'
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
+ - plot:
+ - title: '64B-1t1c-eth-l2*-ndrdisc'
+ group: 'RFC2544: Xconnect and Bridge Domain'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
+ - title: '64B-2t2c-eth-l2*-ndrdisc'
+ group: 'RFC2544: Xconnect and Bridge Domain'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
+
+ - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
+ group: 'RFC2544: IPv4 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
+ - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
+ group: 'RFC2544: IPv4 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
+
+ - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
+ group: 'RFC2544: IPv6 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
+ - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
+ group: 'RFC2544: IPv6 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-*-vhost-*-ndrdisc'
+ group: 'RFC2544: vhost-user'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
+ - title: '64B-2t2c-*-vhost-*-ndrdisc'
+ group: 'RFC2544: vhost-user'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
+
+- job-template:
+ name: 'csit-vpp-perf-trend-semi-weekly-master'
+
+ description: |
+ Purpose of this job is to validate latest vpp build from corresponding
+ branch stored in nexus against verified CSIT codebase of corresponding
+ branch.
+
+ consumer
+ csit-dev trending semi-weekly
+ objective
+ semi-weekly perf trending of vpp master build job
+ name
+ csit-vpp-perf-trend-semi-weekly
+ trigger
+ scheduled semi-weekly
+ perf test-cases selection
+ all CSIT perf suites
+ default tags for vpp startup config and perf test type
+ 1T1C - one worker thread, one core
+ 2T2C - two worker threads, two cores
+ X710 - Intel x710 Fortville NIC
+ XL710 - Intel xl710 Fortville NIC
+ NDRDISC - discovery of NDR throughput
+ results
+ jjb verify - no
+ present
+ jenkins trending graphs
+
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-4c-4g'
+ concurrent: false
+
+ 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}'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: '1440'
+
+ triggers:
+ - timed: 'H H(20-23) * * 2,6'
+
+ builders:
+ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+ - inject:
+ properties-file: variables.prop
+ - shell:
+ !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'csit/archive/*.*'
+ latest-only: false
+
+ - robot-report:
+ output-path: 'csit/archive'
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
+ - plot:
+ - title: '64B-1t1c-eth-l2*-ndrdisc'
+ group: 'RFC2544: Xconnect and Bridge Domain'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
+ - title: '64B-2t2c-eth-l2*-ndrdisc'
+ group: 'RFC2544: Xconnect and Bridge Domain'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
+
+ - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
+ group: 'RFC2544: IPv4 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
+ - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
+ group: 'RFC2544: IPv4 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
+
+ - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
+ group: 'RFC2544: IPv6 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
+ - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
+ group: 'RFC2544: IPv6 base, scale, feature'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in software'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '64B-2t2c-ethip4*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-1t1c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-3.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+ - title: '78B-2t2c-ethip6*-ndrdisc'
+ group: 'RFC2544: Overlay tunnels with crypto in hardware'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-4.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
+
+ - title: '64B-1t1c-*-vhost-*-ndrdisc'
+ group: 'RFC2544: vhost-user'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-1.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
+ - title: '64B-2t2c-*-vhost-*-ndrdisc'
+ group: 'RFC2544: vhost-user'
+ yaxis: 'Packets Per Second'
+ num-builds: '20'
+ keep-records: True
+ csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-2.csv'
+ series:
+ - file: 'output_perf_data.xml'
+ format: xml
+ xpath-type: 'nodeset'
+ xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
+
+- job-template:
+ name: 'csit-vpp-perf-check-{stream}'
+
+ description: |
+ consumer
+ csit-dev perf code base checks
+ objective
+ check csit perf code base
+ job
+ name
+ csit-vpp-perf-check
+ trigger
+ see below
+ perf test-cases selection
+ all CSIT perf suites
+ keywords
+ format - keyword, tag_list
+ verify-perf-ndrdisc, NDRDISC
+ verify-perf-pdrdisc, PDRDISC
+ verify-perf-ndrchk, NDRCHK
+ default tags for vpp startup config and perf test type
+ 1T1C
+ one worker thread, one core
+ 2T2C
+ two worker threads, two cores
+ results
+ jjb verify
+ PASS/FAIL
+ present
+ no
+ analyse
+ csit project
+ catch malfunctions
+ catch degradations
+
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-4c-4g'
+ concurrent: false
+
+ 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}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: '1440'
+
+ triggers:
+ - gerrit:
+ server-name: 'Primary'
+ trigger-on:
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-ndrdisc'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-pdrdisc'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-ndrchk'
+ 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-vpp-perf-check.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'csit/archive/*.*'
+ latest-only: false
+
+ - robot-report:
+ output-path: 'csit/archive'
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
+- job-template:
+ name: 'csit-vpp-perf-ndrchk-daily-master'
+
+ description: |
+ objective
+ check vpp perf ndr chk daily
+ job
+ name
+ csit-vpp-perf-ndrchk-daily
+ trigger
+ daily
+ perf test-cases selection
+ all CSIT perf suites
+ default tags for vpp startup config and perf test type
+ 1T1C - one worker thread, one core
+ 2T2C - two worker threads, two cores
+ results
+ jjb verify
+ PASS/FAIL
+ present
+ no
+ analyse
+ csit project
+ catch malfunctions
+ catch degradations
+
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-4c-4g'
+ concurrent: false
+
+ 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}'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: '1440'
+
+ triggers:
+ - timed: 'H H(2-4) * * *'
+
+ builders:
+ - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+ - inject:
+ properties-file: variables.prop
+ - shell:
+ !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'csit/archive/*.*'
+ latest-only: false
+
+ - robot-report:
+ output-path: 'csit/archive'
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
+- job-template:
+ name: 'csit-vpp-perf-verify-{stream}'
+
+ description: |
+ objective
+ perf verify - per csit gerrit patch
+ job
+ name
+ csit-vpp-perf-verify
+ trigger
+ keyword in comment to csit patch
+ perf test-cases selection
+ test-cases selected using trigger keywords paired with tags
+ all test-cases are labelled with CSIT RF topic tags defined in
+ csit/docs/tag_documentation.rst
+ proposed keywords
+ focus on testing specified vpp packet processing path
+ format - keyword - tag_list
+ perf_verify_ip4 - IP4Base, IP4Scale2M
+ perf_verify_ip6 - IP6Base, IP6Scale2M
+ perf_verify_l2 - L2XC, L2BD
+ perf_verify_lisp - 4Lisp, 6Lisp
+ perf_verify_vxlan - Vxlan
+ perf_verify_vhost - Vhost
+ default tags for vpp startup config and perf test type
+ 1T1C
+ one worker thread, one core
+ X520
+ x520 Niantic NIC
+ NDRDISC
+ discovery of NDR throughput
+ results
+ jjb verify
+ PASS/FAIL
+ present
+ no
+ analyse
+ no
+ project-type: freestyle
+ node: 'ubuntu1604-basebuild-4c-4g'
+ concurrent: false
+
+ 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}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: '1440'
+
+ triggers:
+ - gerrit:
+ server-name: 'Primary'
+ trigger-on:
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-l2'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-ip4'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-ip6'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-lisp'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-vxlan'
+ - comment-added-contains-event:
+ comment-contains-value: 'verify-perf-vhost'
+ 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-vpp-perf-verify.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'csit/archive/*.*'
+ latest-only: false
+
+ - robot-report:
+ output-path: 'csit/archive'
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- parameter:
name: test-type-parameter
parameters:
diff --git a/jjb/csit/include-raw-csit-vpp-perf-check.sh b/jjb/csit/include-raw-csit-vpp-perf-check.sh
new file mode 100644
index 000000000..775f78e1c
--- /dev/null
+++ b/jjb/csit/include-raw-csit-vpp-perf-check.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+ | grep -oE 'verify-perf-(ndrdisc|pdrdisc|ndrchk)' \
+ | awk '{print toupper($0)}'`
+export TEST_TAG=${TRIGGER}
+
+# execute csit bootstrap script if it exists
+if [ ! -e bootstrap-verify-perf.sh ]
+then
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf.sh
+# run the script
+./bootstrap-verify-perf.sh
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh b/jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh
new file mode 100644
index 000000000..a4aead5ca
--- /dev/null
+++ b/jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -xeu -o pipefail
+
+# check BRANCH_ID value
+if [ "$BRANCH_ID" == "" ]; then
+ echo "branch_id not provided => 'master' will be used"
+ BRANCH_ID="master"
+fi
+
+# make sure there is no csit directory
+if [ -d "./csit/" ]; then
+ rm -rf ./csit/
+fi
+
+# clone csit
+git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit
+
+# if the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+ echo "Failed to run: git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit"
+ exit 1
+fi
+
+cd csit
+
+# get the latest verified version of the required branch
+BRANCH_NAME=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
+
+if [ "${BRANCH_NAME}" == "" ]; then
+ echo "No verified version found for requested branch - exiting"
+ exit 1
+fi
+
+# remove 'origin/' from the branch name
+BRANCH_NAME=$(echo ${BRANCH_NAME#origin/})
+
+# checkout to the required branch
+git checkout ${BRANCH_NAME}
+
+export TEST_TAG="PERFTEST_NDRCHK_DAILY"
+
+# execute csit bootstrap script if it exists
+if [ -e bootstrap-verify-perf.sh ]
+then
+ # make sure that bootstrap.sh is executable
+ chmod +x bootstrap-verify-perf.sh
+ # run the script
+ ./bootstrap-verify-perf.sh
+else
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh b/jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh
new file mode 100644
index 000000000..1c02a67c6
--- /dev/null
+++ b/jjb/csit/include-raw-csit-vpp-perf-trend-daily.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -xeu -o pipefail
+
+# check BRANCH_ID value
+if [ "$BRANCH_ID" == "" ]; then
+ echo "branch_id not provided => 'master' will be used"
+ BRANCH_ID="master"
+fi
+
+# make sure there is no csit directory
+if [ -d "./csit/" ]; then
+ rm -rf ./csit/
+fi
+
+# clone csit
+git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit
+
+# if the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+ echo "Failed to run: git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit"
+ exit 1
+fi
+
+cd csit
+
+# get the latest verified version of the required branch
+BRANCH_NAME=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
+
+if [ "${BRANCH_NAME}" == "" ]; then
+ echo "No verified version found for requested branch - exiting"
+ exit 1
+fi
+
+# remove 'origin/' from the branch name
+BRANCH_NAME=$(echo ${BRANCH_NAME#origin/})
+
+# checkout to the required branch
+git checkout ${BRANCH_NAME}
+
+export TEST_TAG="PERFTEST_DAILY"
+
+# execute csit bootstrap script if it exists
+if [ -e bootstrap-verify-perf.sh ]
+then
+ # make sure that bootstrap.sh is executable
+ chmod +x bootstrap-verify-perf.sh
+ # run the script
+ ./bootstrap-verify-perf.sh
+else
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh b/jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh
new file mode 100644
index 000000000..972dfe693
--- /dev/null
+++ b/jjb/csit/include-raw-csit-vpp-perf-trend-semi-weekly.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -xeu -o pipefail
+
+# check BRANCH_ID value
+if [ "$BRANCH_ID" == "" ]; then
+ echo "branch_id not provided => 'master' will be used"
+ BRANCH_ID="master"
+fi
+
+# make sure there is no csit directory
+if [ -d "./csit/" ]; then
+ rm -rf ./csit/
+fi
+
+# clone csit
+git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit
+
+# if the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+ echo "Failed to run: git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit"
+ exit 1
+fi
+
+cd csit
+
+# get the latest verified version of the required branch
+BRANCH_NAME=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
+
+if [ "${BRANCH_NAME}" == "" ]; then
+ echo "No verified version found for requested branch - exiting"
+ exit 1
+fi
+
+# remove 'origin/' from the branch name
+BRANCH_NAME=$(echo ${BRANCH_NAME#origin/})
+
+# checkout to the required branch
+git checkout ${BRANCH_NAME}
+
+export TEST_TAG="PERFTEST_SEMI_WEEKLY"
+
+# execute csit bootstrap script if it exists
+if [ -e bootstrap-verify-perf.sh ]
+then
+ # make sure that bootstrap.sh is executable
+ chmod +x bootstrap-verify-perf.sh
+ # run the script
+ ./bootstrap-verify-perf.sh
+else
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/csit/include-raw-csit-vpp-perf-verify.sh b/jjb/csit/include-raw-csit-vpp-perf-verify.sh
new file mode 100644
index 000000000..8c55e1fc2
--- /dev/null
+++ b/jjb/csit/include-raw-csit-vpp-perf-verify.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+ | grep -oE 'verify-perf-(l2|ip4|ip6|lisp|vxlan|vhost)' \
+ | awk '{print toupper($0)}'`
+export TEST_TAG=${TRIGGER}
+
+# execute csit bootstrap script if it exists
+if [ ! -e bootstrap-verify-perf.sh ]
+then
+ echo 'ERROR: No bootstrap-verify-perf.sh found'
+ exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf.sh
+# run the script
+./bootstrap-verify-perf.sh
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index ee6b82ea6..8c9aed4ef 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -60,6 +60,8 @@ fi
rm vpp-api-java*
# install jvpp jars into maven repo, so that maven picks them up when building hc2vpp
+version=`./jvpp-version`
+
current_dir=`pwd`
cd /usr/share/java
@@ -69,7 +71,6 @@ for item in jvpp*.jar; do
# Version = 17.01
basefile=$(basename -s .jar "$item")
artifactId=$(echo "$basefile" | cut -d '-' -f 1-2)
- version=$(echo "$basefile" | cut -d '-' -f 3)
mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
done
diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh
new file mode 100644
index 000000000..af004a35d
--- /dev/null
+++ b/jjb/scripts/packagecloud_push.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# PCIO_CO is a Jenkins Global Environment variable
+
+FACTER_OS=$(/usr/bin/facter operatingsystem)
+if [ -f ~/.packagecloud ]; then
+ case "$FACTER_OS" in
+ Ubuntu)
+ FACTER_LSBNAME=$(/usr/bin/facter lsbdistcodename)
+ DEBS=$(find . -type f -iname '*.deb')
+ package_cloud push "${PCIO_CO}/${STREAM}/ubuntu/${FACTER_LSBNAME}/main/" ${DEBS}
+ ;;
+ CentOS)
+ FACTER_OSMAJREL=$(/usr/bin/facter operatingsystemmajrelease)
+ FACTER_ARCH=$(/usr/bin/facter architecture)
+ RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
+ package_cloud push "${PCIO_CO}/${STREAM}/el/${FACTER_OSMAJREL}/os/${FACTER_ARCH}/" ${RPMS}
+ ;;
+ esac
+fi
diff --git a/jjb/vpp/include-raw-vpp-packagecloud-push.sh b/jjb/vpp/include-raw-vpp-packagecloud-push.sh
deleted file mode 100644
index 8908d09c5..000000000
--- a/jjb/vpp/include-raw-vpp-packagecloud-push.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "${OS}" == "ubuntu1404" ]; then
- DEBS=$(find . -type f -iname '*.deb')
- package_cloud push fdio/test/ubuntu/trusty/main ${DEBS}
-elif [ "${OS}" == "ubuntu1604" ]; then
- DEBS=$(find . -type f -iname '*.deb')
- package_cloud push fdio/test/ubuntu/xenial/main ${DEBS}
-elif [ "${OS}" == "centos7" ]; then
- # Find the files
- RPMS=$(find . -type f -iname '*.rpm')
- SRPMS=$(find . -type f -iname '*.srpm')
- SRCRPMS=$(find . -type f -name '*.src.rpm')
- package_cloud push fdio/test/el/7/os/x86_64/ ${RPMS} ${SRPMS} ${SRCRPMS}
-fi \ No newline at end of file
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 36e12c0b1..0f72442e8 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -215,6 +215,8 @@
maven: 'mvn33-new'
- maven-exec:
maven-version: 'mvn33-new'
+ - stream-parameter:
+ stream: '{stream}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -234,6 +236,10 @@
branch: '{branch}'
builders:
+ - config-file-provider:
+ files:
+ - file-id: '.packagecloud'
+ target: '/home/jenkins'
- maven-target:
maven-version: 'mvn33-new'
goals: '--version'
@@ -254,6 +260,10 @@
!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'
@@ -692,6 +702,8 @@
branch: '{branch}'
- os-parameter:
os: '{os}'
+ - stream-parameter:
+ stream: '{stream}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -728,7 +740,7 @@
- include-raw-vpp-build.sh
- shell:
!include-raw-escape:
- - include-raw-vpp-packagecloud-push.sh
+ - ../scripts/packagecloud_push.sh
publishers:
- archive:
@@ -739,4 +751,3 @@
default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
-