X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=ce72e4506eee81e320591a63dfb0da3bf86bee8c;hb=b6a693fd2a4d5ed4016d19663f2e4274a693772e;hp=aa03e141bbb12bdfe201fdfb9ec775bb75d38c7e;hpb=08e16b6afa22e915e3f6a6ff0d039400e71e51aa;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index aa03e141b..ce72e4506 100644
--- 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:
@@ -297,7 +297,7 @@
 
     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
@@ -524,7 +524,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-checkstyle:
@@ -735,7 +735,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '90'
 
     triggers:
         - gerrit-trigger-checkstyle-nonvoting:
@@ -766,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}'
 
@@ -838,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'
@@ -861,7 +856,7 @@
 
     project-type: freestyle
     node: ubuntu1604-us
-    concurrent: true
+    concurrent: false
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -1156,5 +1151,3 @@
             rerun-unstable-builds: false
             max-failed-builds: 1
             fixed-delay: 90
-
-