summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/csit/csit.yaml120
-rw-r--r--jjb/hc2vpp/hc2vpp.yaml13
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh6
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh12
-rw-r--r--jjb/honeycomb/honeycomb.yaml3
-rw-r--r--jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh4
-rw-r--r--jjb/nsh_sfc/nsh_sfc.yaml4
-rw-r--r--jjb/tldk/include-raw-csit-tldk-functional-virl.sh15
-rw-r--r--jjb/tldk/tldk.yaml50
-rw-r--r--jjb/vpp/include-raw-vpp-maven-push.sh8
10 files changed, 131 insertions, 104 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index a39f80e56..a171bb522 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -145,11 +145,11 @@
publishers:
- archive-artifacts:
- artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+ artifacts: 'csit/archive/*.*'
latest-only: false
- robot-report:
- output-path: ''
+ output-path: 'csit/archive'
- plot:
- title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'
@@ -265,11 +265,11 @@
publishers:
- archive-artifacts:
- artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+ artifacts: 'csit/archive/*.*'
latest-only: false
- robot-report:
- output-path: ''
+ output-path: 'csit/archive'
- plot:
- title: '64B-1t1c-eth-l2*-ndrdisc'
@@ -2718,7 +2718,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2729,7 +2729,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2741,7 +2741,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -2752,7 +2752,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -2764,7 +2764,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -2775,7 +2775,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -2787,7 +2787,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2798,7 +2798,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2809,7 +2809,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2820,7 +2820,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2832,7 +2832,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2843,7 +2843,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2854,7 +2854,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2865,7 +2865,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2877,7 +2877,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2888,7 +2888,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2899,7 +2899,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2910,7 +2910,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2922,7 +2922,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2933,7 +2933,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2944,7 +2944,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2955,7 +2955,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2967,7 +2967,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2978,7 +2978,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -2989,7 +2989,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3000,7 +3000,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3012,7 +3012,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3023,7 +3023,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3106,7 +3106,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3117,7 +3117,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3129,7 +3129,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -3140,7 +3140,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -3152,7 +3152,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -3163,7 +3163,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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")]'
@@ -3175,7 +3175,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3186,7 +3186,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3197,7 +3197,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3208,7 +3208,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3220,7 +3220,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3231,7 +3231,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3242,7 +3242,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3253,7 +3253,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3265,7 +3265,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3276,7 +3276,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3287,7 +3287,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3298,7 +3298,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3310,7 +3310,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3321,7 +3321,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3332,7 +3332,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3343,7 +3343,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3355,7 +3355,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3366,7 +3366,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3377,7 +3377,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-3.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3388,7 +3388,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-4.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3400,7 +3400,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-1.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
@@ -3411,7 +3411,7 @@
keep-records: True
csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-2.csv'
series:
- - file: 'output_perf_data.xml'
+ - file: 'csit/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"))]'
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index c74ce089d..68282f3c3 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -7,12 +7,9 @@
- 'hc2vpp-verify-image-{stream}-{os}'
project: 'hc2vpp'
os:
- - ubuntu1404:
- repo-os-part: 'ubuntu.trusty.main'
- skip-site: 'false'
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- skip-site: 'true'
+ skip-site: 'false'
- centos7:
repo-os-part: 'centos7'
skip-site: 'true'
@@ -63,9 +60,6 @@
name: 'hc2vpp'
branch: '{branch}'
- prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
@@ -131,9 +125,6 @@
unstable: true
notbuilt: true
- prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
@@ -261,8 +252,6 @@
result: 'success'
prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
- shell:
!include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
maven:
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index c99d6657d..968a18a52 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -17,11 +17,7 @@ if [ "${VERSION}" != 'RELEASE' ]; then
fi
fi
-if [ "${OS}" == "ubuntu1404" ]; then
- OS_PART="ubuntu.trusty.main"
- PACKAGE="deb deb.md5"
- CLASS="deb"
-elif [ "${OS}" == "ubuntu1604" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
OS_PART="ubuntu.xenial.main"
PACKAGE="deb deb.md5"
CLASS="deb"
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
index d4c2be38f..042e0bffa 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
@@ -34,18 +34,6 @@ if [ "${OS}" == "centos7" ]; then
do
push_rpm "$i"
done
-elif [ "${OS}" == "ubuntu1404" ]; then
-
- # Build the debs
- ./packaging/deb/trusty/debuild.sh
-
- # Find the files
- DEBS=$(find . -type f -iname '*.deb')
- # publish hc2vpp packages
- for i in $DEBS
- do
- push_deb "$i"
- done
elif [ "${OS}" == "ubuntu1604" ]; then
# Build the debs
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index a420d25d5..69fa8373a 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -58,9 +58,6 @@
name: 'honeycomb'
branch: '{branch}'
- prebuilders:
- - shell: |
- if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
index 4cfd30007..500433e4c 100644
--- a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
+++ b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh
@@ -2,7 +2,7 @@
# basic build script example
set -e -o pipefail
echo "Looking for jars/debs/rpms to publish"
-if [ "${OS}" == "ubuntu1404" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
# Find the files
DEBS=$(find . -type f -iname '*.deb')
echo "Found DEBS=${DEBS}"
@@ -41,4 +41,4 @@ elif [ "${OS}" == "centos7" ]; then
do
push_rpm "$i"
done
-fi \ No newline at end of file
+fi
diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index a5a242241..fb7f2ba43 100644
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -10,8 +10,6 @@
project: 'nsh_sfc'
os:
- - ubuntu1404:
- repo-os-part: 'ubuntu.trusty.main'
- ubuntu1604:
repo-os-part: 'ubuntu.xenial.main'
- centos7:
@@ -415,7 +413,7 @@
triggers:
- reverse:
- jobs: 'nsh_sfc-merge-{stream}-ubuntu1404'
+ jobs: 'nsh_sfc-merge-{stream}-ubuntu1604'
result: 'success'
- gerrit:
server-name: 'Primary'
diff --git a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh
new file mode 100644
index 000000000..b18290cdc
--- /dev/null
+++ b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# execute nsh_sfc bootstrap script if it exists
+if [ -e bootstrap-TLDK.sh ]
+then
+ # make sure that bootstrap-TLDK.sh is executable
+ chmod +x bootstrap-TLDK.sh
+ # run the script
+ ./bootstrap-TLDK.sh
+else
+ echo 'ERROR: No bootstrap-TLDK.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index f2357044d..a91183cb2 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -4,6 +4,7 @@
- '{project}-verify-{stream}-{os}'
- '{project}-merge-{stream}-{os}'
- '{project}-verify-image-{stream}-{os}'
+ - 'csit-tldk-verify-func-{stream}-{os}-virl'
project: 'tldk'
os:
@@ -169,3 +170,52 @@
publishers:
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
+
+- job-template:
+ name: 'csit-tldk-verify-func-{stream}-{os}-virl'
+
+ project-type: freestyle
+ node: '{os}-basebuild-4c-4g'
+ 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}'
+
+ 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-patch-submitted:
+ name: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - shell:
+ !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+
+ publishers:
+ - archive-artifacts:
+ artifacts: 'report.html, log.html, output.xml'
+ latest-only: false
+
+ - robot-report:
+ output-path: ''
+
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh
index 0d476b581..78bffb667 100644
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -10,7 +10,7 @@ GROUP_ID="io.fd.${PROJECT}"
BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
BASEREPOID='fdio-'
-if [ "${OS}" == "ubuntu1404" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
# Find the files
JARS=$(find . -type f -iname '*.jar')
DEBS=$(find . -type f -iname '*.deb')
@@ -23,12 +23,6 @@ if [ "${OS}" == "ubuntu1404" ]; then
do
push_deb "$i"
done
-elif [ "${OS}" == "ubuntu1604" ]; then
- DEBS=$(find . -type f -iname '*.deb')
- for i in $DEBS
- do
- push_deb "$i"
- done
elif [ "${OS}" == "centos7" ]; then
# Find the files
RPMS=$(find . -type f -iname '*.rpm')