Merge "Initial commit of support for rpm_dpdk project. Fix script name and removed...

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 911c484..b6a8bf2 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -53,7 +53,7 @@
             branch: 'stable/1609'
             repo-stream-part: 'stable.1609'
 
-    os: ubuntu1404
+    os: ubuntu1604
     type:
         - all
         - short
@@ -112,7 +112,7 @@
     name: 'vpp-csit-verify-virl-1604-test-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1404'
+    node: 'verify-ubuntu1604'
     concurrent: true
 
     logrotate:
@@ -127,52 +127,39 @@
         - gerrit-parameter:
             branch: '{branch}'
         - os-parameter:
-            os: 'ubuntu1404'
+            os: 'ubuntu1604'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - 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
+        - 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: 'build-root/*.rpm,build-root/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit'
 
 - job-template:
     name: 'vpp-verify-image-{stream}-{os}'