diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/cicn/cicn.yaml | 4 | ||||
-rw-r--r-- | jjb/csit/csit-hc2vpp.yaml | 130 | ||||
-rw-r--r-- | jjb/csit/csit.yaml | 128 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-hc2vpp-verify-func.sh | 19 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh | 19 | ||||
-rw-r--r-- | jjb/hc2vpp/hc2vpp-csit.yaml (renamed from jjb/hc2vpp/csit-hc2vpp.yaml) | 86 | ||||
-rw-r--r-- | jjb/hc2vpp/hc2vpp.yaml | 13 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-integration-odl.sh | 6 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh | 2 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-csit-perf.sh | 38 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 6 | ||||
-rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh | 12 | ||||
-rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 3 | ||||
-rw-r--r-- | jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh | 27 | ||||
-rw-r--r-- | jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh | 15 | ||||
-rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 106 |
16 files changed, 510 insertions, 104 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 57ba02f48..6e19786d7 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -177,6 +177,8 @@ repo-os-part: 'ubuntu.trusty.main' - ubuntu1604: repo-os-part: 'ubuntu.xenial.main' + - centos7: + repo-os-part: 'centos7' stream: - master: branch: 'cicn-plugin/master' @@ -1559,7 +1561,7 @@ - include-raw-cicn-android-sdk-build.sh publishers: - archive: - artifacts: 'iget_android/app/build/outputs/apk/*.apk,ccnxandroidmetis/MetisControl/build/outputs/apk/*.apk,build/viper/viper_armv7/build/outputs/apk/*.apk' + artifacts: 'iGetAndroid/app/build/outputs/apk/*.apk,MetisForwarder/app/build/outputs/apk/*.apk,build/viper/viper-armv7//build/outputs/apk/*.apk' allow-empty: 'true' fingerprint: false only-if-success: true diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml new file mode 100644 index 000000000..7a929ae9b --- /dev/null +++ b/jjb/csit/csit-hc2vpp.yaml @@ -0,0 +1,130 @@ +- project: + name: csit-hc2vpp + description: 'jenkins jobs to verify Hc2vpp functional and performance tests.' + jobs: + - 'csit-hc2vpp-verify-func-{os}' + - 'csit-hc2vpp-verify-perf' + project: 'csit' + branch: 'master' + build-artifact-num-to-keep: 10 + + os: + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + +- job-template: + name: 'csit-hc2vpp-verify-func-{os}' + + 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}' + - os-parameter: + os: '{os}' + - stream-parameter: + stream: 'master' + + 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: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'verify-hc2vpp-func' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + builders: + - shell: + !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log' + latest-only: false + - email-notification: + email-prefix: '[csit]' + - robot-report: + output-path: 'csit' + +- job-template: + name: 'csit-hc2vpp-verify-perf' + + 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}' + - os-parameter: + os: '{os}' + - stream-parameter: + stream: 'master' + + 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: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'verify-hc2vpp-perf' + + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + builders: + - shell: + !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh + + publishers: + - archive-artifacts: + artifacts: 'archive/*.*' + latest-only: false + + - robot-report: + output-path: 'archive' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index a39f80e56..71f91a366 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: 'archive/*.*' latest-only: false - robot-report: - output-path: '' + output-path: '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: 'archive/*.*' latest-only: false - robot-report: - output-path: '' + output-path: '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"))]' @@ -3505,11 +3505,11 @@ publishers: - archive-artifacts: - artifacts: 'csit/archive/*.*' + artifacts: 'archive/*.*' latest-only: false - robot-report: - output-path: 'csit/archive' + output-path: 'archive' - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -3679,11 +3679,11 @@ publishers: - archive-artifacts: - artifacts: 'csit/archive/*.*' + artifacts: 'archive/*.*' latest-only: false - robot-report: - output-path: 'csit/archive' + output-path: 'archive' - fdio-infra-shiplogs: maven-version: 'mvn33-new' diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh new file mode 100644 index 000000000..d81c09c9b --- /dev/null +++ b/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# execute csit bootstrap script if it exists +if [ ! -e bootstrap-hc2vpp-integration.sh ] +then + echo 'ERROR: No bootstrap-hc2vpp-integration.sh found' + exit 1 +else + # make sure that bootstrap.sh is executable + chmod +x bootstrap-hc2vpp-integration.sh + # run the script + if [ ${STREAM} == 'master' ]; then + ./bootstrap-hc2vpp-integration.sh ${STREAM} ${OS} + else + ./bootstrap-hc2vpp-integration.sh 'stable.'${STREAM} ${OS} + fi +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh b/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh new file mode 100644 index 000000000..d9a5fb1f4 --- /dev/null +++ b/jjb/csit/include-raw-csit-hc2vpp-verify-perf.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# execute csit bootstrap script if it exists +if [ ! -e bootstrap-hc2vpp-perf.sh ] +then + echo 'ERROR: No bootstrap-hc2vpp-perf.sh found' + exit 1 +else + # make sure that bootstrap.sh is executable + chmod +x bootstrap-hc2vpp-perf.sh + # run the script + if [ ${STREAM} == 'master' ]; then + ./bootstrap-hc2vpp-perf.sh ${STREAM} ${OS} + else + ./bootstrap-hc2vpp-perf.sh 'stable.'${STREAM} ${OS} + fi +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index 606279c45..de63b7099 100644 --- a/jjb/hc2vpp/csit-hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -1,5 +1,5 @@ - project: - name: csit-hc2vpp + name: hc2vpp-csit description: 'jenkins jobs to test Hc2vpp features.' jobs: - 'hc2vpp-csit-integration-{stream}-{os}' @@ -24,6 +24,23 @@ odl: - boron +- project: + name: csit-hc2vpp-perf + description: 'jenkins jobs to test Hc2vpp performance.' + jobs: + - 'hc2vpp-csit-perf-{stream}-{os}' + project: 'hc2vpp' + build-artifact-num-to-keep: 10 + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + os: + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + odl: + - boron + - job-template: name: 'hc2vpp-csit-integration-{stream}-{os}' @@ -296,6 +313,73 @@ - robot-report: output-path: 'csit' +- job-template: + name: 'hc2vpp-csit-perf-{stream}-{os}' + + project-type: freestyle + node: '{os}-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}' + - os-parameter: + os: '{os}' + - stream-parameter: + stream: '{stream}' + - odl-parameter: + odl: '{odl}' + + 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: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'verify-perf' + + 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: include-raw-hc2vpp-csit-perf.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: odl-parameter parameters: 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-csit-integration-odl.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration-odl.sh index 6d1b3bfba..5cd8b3e94 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration-odl.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration-odl.sh @@ -14,19 +14,19 @@ git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH} # If the git clone fails, complain clearly and exit if [ $? != 0 ]; then - echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch master" + echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}" exit fi cd csit # execute csit bootstrap script if it exists -if [ ! -e bootstrap-hc2vpp-integration.sh ] +if [ ! -e bootstrap-hc2vpp-integration-odl.sh ] then echo 'ERROR: No bootstrap-hc2vpp-integration.sh found' exit 1 else # make sure that bootstrap.sh is executable - chmod +x bootstrap-hc2vpp-integration.sh + chmod +x bootstrap-hc2vpp-integration-odl.sh # run the script if [ ${STREAM} == 'master' ]; then ./bootstrap-hc2vpp-integration-odl.sh ${STREAM} ${OS} ${ODL} diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh index bf6e70c1d..e4bbd3fc3 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-integration.sh @@ -14,7 +14,7 @@ git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH} # If the git clone fails, complain clearly and exit if [ $? != 0 ]; then - echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch master" + echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}" exit fi diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-perf.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-perf.sh new file mode 100644 index 000000000..266c9ede2 --- /dev/null +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-perf.sh @@ -0,0 +1,38 @@ +#!/bin/bash +set -xeu -o pipefail + +# Get CSIT branch +if [ -f csit-test-branch ]; then + chmod +x csit-test-branch + CSIT_BRANCH=`./csit-test-branch` +else + CSIT_BRANCH='master' +fi + +# Clone csit +git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH} + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH}" + exit +fi + +cd csit +# execute csit bootstrap script if it exists +if [ ! -e bootstrap-hc2vpp-perf.sh ] +then + echo 'ERROR: No bootstrap-hc2vpp-perf.sh found' + exit 1 +else + # make sure that bootstrap.sh is executable + chmod +x bootstrap-hc2vpp-perf.sh + # run the script + if [ ${STREAM} == 'master' ]; then + ./bootstrap-hc2vpp-perf.sh ${STREAM} ${OS} ${ODL} + else + ./bootstrap-hc2vpp-perf.sh 'stable.'${STREAM} ${OS} ${ODL} + fi +fi + +# 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 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-csit-nsh_sfc-functional-virl.sh b/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh new file mode 100644 index 000000000..87dd9b8ca --- /dev/null +++ b/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -xeu -o pipefail + +# Clone csit and start tests +git clone https://gerrit.fd.io/r/csit + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/csit" +exit +fi + +cd csit + +# execute nsh_sfc bootstrap script if it exists +if [ -e bootstrap-nsh_sfc-functional-virl.sh ] +then + # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable + chmod +x bootstrap-nsh_sfc-functional-virl.sh + # run the script + ./bootstrap-nsh_sfc-functional-virl.sh +else + echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh new file mode 100644 index 000000000..e79020460 --- /dev/null +++ b/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# execute nsh_sfc bootstrap script if it exists +if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ] +then + echo 'ERROR: No bootstrap-verify-perf-nsh_sfc.sh found' + exit 1 +fi + +# make sure that bootstrap-verify-perf.sh is executable +chmod +x bootstrap-verify-perf-nsh_sfc.sh +# run the script +./bootstrap-verify-perf-nsh_sfc.sh + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index fb7f2ba43..0dde7e323 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -7,13 +7,13 @@ - 'nsh_sfc-verify-image-{stream}-{os}' - 'nsh_sfc-verify-docs-{stream}' - 'nsh_sfc-merge-docs-{stream}' + - 'csit-nsh_sfc-verify-perf-{stream}' + - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' project: 'nsh_sfc' os: - ubuntu1604: repo-os-part: 'ubuntu.xenial.main' - - centos7: - repo-os-part: 'centos7' stream: - master: branch: 'master' @@ -455,4 +455,106 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'csit-nsh_sfc-verify-perf-{stream}' + + project-type: freestyle + node: 'ubuntu1604-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-non-activity-timeout: + build-timeout: 30 + + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'nsh_sfc_perf_weekly' + + builders: + - shell: + !include-raw-escape: jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh + + publishers: + - archive-artifacts: + artifacts: 'report.html, log.html, output.xml, output_perf_data.xml' + latest-only: false + + - robot-report: + output-path: '' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-nsh_sfc-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}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + + 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-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'nsh_sfc_func' + + builders: + - shell: + !include-raw-escape: include-raw-csit-nsh_sfc-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' |