Merge "VPP: lowering build timeout to 120"

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 889197d..ce72e45 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -206,7 +206,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -291,13 +291,13 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-checkstyle-nonvoting:
+        - gerrit-trigger-checkstyle:
             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
@@ -461,6 +461,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
@@ -522,7 +524,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-checkstyle:
@@ -733,10 +735,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,11 +766,6 @@
         - 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}'
 
@@ -836,11 +833,11 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit/archive/*.*'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
@@ -859,7 +856,7 @@
 
     project-type: freestyle
     node: ubuntu1604-us
-    concurrent: true
+    concurrent: false
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -1154,5 +1151,3 @@
             rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
-
-