X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvpp%2Fvpp.yaml;h=406ae3aa37ab3d175b67367439b2739b470ad94d;hb=931f48e4245eab67f2160d21c01b3c062631472a;hp=d16e1a1d8527c2b828136e1ed77bcb92f89ba4b1;hpb=b7dcf868c2d994810b8f67745ed58e245b68f978;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index d16e1a1d8..406ae3aa3 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,6 +54,9 @@
         - '1609':
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1609'
 
     os: ubuntu1604
     type:
@@ -63,7 +68,7 @@
     name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -107,65 +112,14 @@
             fingerprint: false
             only-if-success: true
             default-excludes: false
-
-- job-template:
-    name: 'vpp-csit-verify-virl-1604-test-{stream}'
-
-    project-type: freestyle
-    node: 'verify-ubuntu1604'
-    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: 'ubuntu1604'
-
-    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: 'virl-1604-test'
-
-    builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-csit-functional.sh
-    
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -216,11 +170,15 @@
         - shell:
             !include-raw-escape: include-raw-vpp-build.sh
 
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -236,7 +194,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}'
 
@@ -256,17 +216,17 @@
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - 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
             global-settings: 'global-settings'
             global-settings-type: cfp
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
+        - shell:
+            !include-raw-escape: include-raw-vpp-build.sh
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
@@ -281,12 +241,14 @@
             fingerprint: false
             only-if-success: true
             default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -302,6 +264,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     scm:
         - gerrit-trigger-scm:
@@ -334,11 +298,14 @@
         - robot-report:
             output-path: 'csit'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: false
 
     logrotate:
@@ -356,6 +323,8 @@
             os: '{os}'
         - type-parameter:
             type: '{type}'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
 
     scm:
         - gerrit-trigger-scm:
@@ -387,6 +356,9 @@
         - robot-report:
             output-path: 'csit'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - parameter:
     name: type-parameter
 
@@ -400,7 +372,7 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -416,6 +388,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -434,7 +408,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -452,12 +426,14 @@
             fingerprint: false
             only-if-success: true
             default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -473,6 +449,8 @@
             branch: '{branch}'
         - os-parameter:
             os: 'ubuntu1604'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -507,7 +485,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'vpp-settings'
             settings-type: cfp
@@ -525,3 +503,5 @@
             fingerprint: false
             only-if-success: true
             default-excludes: false
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'