X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=48ec3a4269563574b9b9ce7560116af495968ec6;hb=65a4d811537c502e0e1a403cfd3c1b906021380b;hp=c598940040a64e1e87439c8bdd94284258a9c771;hpb=65828bfb56d7cf187226f5ccfeb8382ad2887451;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index c59894004..48ec3a426 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -56,7 +56,6 @@
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-hw-perf-{stream}'
         - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
     stream:
@@ -74,6 +73,17 @@
             repo-stream-part: 'stable.1807'
     os: ubuntu1604
 
+- project:
+    name: vpp-perpatch
+    jobs:
+        - 'vpp-csit-verify-perf-{stream}-2n-skx'
+    project: 'vpp'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+    os: ubuntu1604
+
 - project:
     name: vpp-master-only
     jobs:
@@ -206,7 +216,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -288,19 +298,20 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
-        - gerrit-trigger-checkstyle:
+        - gerrit-trigger-checkstyle-nonvoting:
             name: '{project}'
             branch: '{branch}'
 
     builders:
         - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
+                - include-raw-vpp-parallel-vars.sh
                 - include-raw-vpp-arm-build.sh
     publishers:
         - archive:
@@ -349,7 +360,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -461,6 +472,8 @@
                   forbidden-file-paths:
                     - compare-type: REG_EXP
                       pattern: .*docs\/.*
+                    - compare-type: REG_EXP
+                      pattern: .*extras\/emacs\/.*
                   disable-strict-forbidden-file-verification: 'true'
             override-votes: true
             gerrit-build-notbuilt-verified-value: 0
@@ -489,8 +502,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-
-
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
 
@@ -522,7 +533,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-checkstyle:
@@ -733,10 +744,10 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '90'
 
     triggers:
-        - gerrit-trigger-checkstyle:
+        - gerrit-trigger-checkstyle-nonvoting:
             name: '{project}'
             branch: '{branch}'
 
@@ -764,17 +775,12 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
-
 - job-template:
-    name: 'vpp-csit-verify-hw-perf-{stream}'
+    name: 'vpp-csit-verify-perf-{stream}-2n-skx'
 
     project-type: freestyle
     node: '{os}-basebuild-8c-32g'
-    concurrent: false
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -790,9 +796,19 @@
         - os-parameter:
             os: '{os}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
+            repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+        - gerrit-refspec-parameter
+        - gerrit-event-type-parameter
+        - gerrit-event-comment-text-parameter
+        - gerrit-csit-refspec-parameter
+        - string:
+            name: CSIT_PERF_TRIAL_DURATION
+            default: "1.0"
+            description: "Duration of a trial measurement in BMRR tests."
+        - string:
+            name: CSIT_PERF_TRIAL_MULTIPLICITY
+            default: "30"
+            description: "Number of subsamples for BMRR tests."
 
     scm:
         - gerrit-trigger-scm:
@@ -802,7 +818,7 @@
 
     wrappers:
         - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 30
+            build-timeout: 300
 
     triggers:
         - gerrit:
@@ -817,30 +833,23 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
             skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
         - shell:
             !include-raw-escape:
-                - include-raw-vpp-csit-verify-perf.sh
+                - clone-csit-run-main.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            artifacts: 'csit_new/*.*, csit_parent/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit_new/'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -859,7 +868,7 @@
 
     project-type: freestyle
     node: ubuntu1604-us
-    concurrent: true
+    concurrent: false
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -1154,5 +1163,3 @@
             rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
-
-