X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=730ab847d48857315eb1c7fe33c319715f425a0a;hb=1509387215f5560b7e3e16ca54de7871c9ef4e53;hp=e6637fe6ce1ef6c84be5344570fc4e57a468c14b;hpb=3aa6254e48141974ec2739a3de75bb2ba74a0448;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index e6637fe6c..730ab847d 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -28,6 +28,9 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1701'
     type:
         - short
         - long
@@ -37,7 +40,6 @@
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
         - 'vpp-csit-verify-hw-perf-{stream}-{type}'
-        - 'vpp-csit-verify-virl-1604-test-{stream}'
     project: 'vpp'
     stream:
         - master:
@@ -52,8 +54,11 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1609'
 
-    os: ubuntu1404
+    os: ubuntu1604
     type:
         - all
         - short
@@ -63,7 +68,7 @@
     name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -108,73 +113,11 @@
             only-if-success: true
             default-excludes: false
 
-- job-template:
-    name: 'vpp-csit-verify-virl-1604-test-{stream}'
-
-    project-type: freestyle
-    node: 'verify-ubuntu1404'
-    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: 'ubuntu1404'
-
-    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: 'virl-1604-test'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-build.sh
-    publishers:
-        - archive:
-            artifacts: 'build-root/*.rpm,build-root/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -229,7 +172,7 @@
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -245,7 +188,9 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -270,7 +215,7 @@
         - shell:
             !include-raw-escape: include-raw-vpp-build.sh
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -295,7 +240,7 @@
     name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -311,6 +256,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     scm:
         - gerrit-trigger-scm:
@@ -347,7 +294,7 @@
     name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: false
 
     logrotate:
@@ -365,6 +312,8 @@
             os: '{os}'
         - type-parameter:
             type: '{type}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     scm:
         - gerrit-trigger-scm:
@@ -373,8 +322,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 30
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -409,7 +358,7 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -425,6 +374,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -443,7 +394,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -466,7 +417,7 @@
     name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -482,6 +433,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -516,7 +469,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp