Update of artifact directory in csit-vpp-master-verify-semiweekly job.

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

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index 603000f..29aab71 100644 (file)
--- a/jjb/csit/csit-vpp-functional.yaml
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -5,8 +5,8 @@
     jobs:
         - 'csit-vpp-perf-hw-{type}'
         - 'csit-vpp-functional-virl'
-        - 'csit-vpp-functional-nodepool'
-        - 'csit-vpp-master-verify-weekly'
+        - 'csit-vpp-verify-weekly'
+        - 'csit-vpp-master-verify-semiweekly'
 
     project: 'csit'
     branch: 'master'
@@ -111,11 +111,12 @@
             output-path: ''
 
 - job-template:
-    name: 'csit-vpp-functional-nodepool'
+    name: 'csit-vpp-verify-weekly'
+    description: 'Purpose of this job is to validate CSIT code against verified vpp build and apply csit-verified tag in case of success.'
 
     project-type: freestyle
-    node: multilink
-    concurrent: true
+    node: verify
+    concurrent: false
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -123,31 +124,55 @@
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
     scm:
-        - zuul-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: '$ZUUL_REF'
-            commit: '$ZUUL_COMMIT'
+            branch: 'master'
 
     wrappers:
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - timed: '0 4 * * 0'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'csit-vpp-ref-verify'
+            name: '{project}'
+            branch: '{branch}'
+
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-vpp-functional-multilink.sh
+            !include-raw-escape jjb/csit/include-raw-csit-vpp-verify-weekly.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit'
+
+        - git:
+               push-only-if-success: true
+               tags:
+                   - tag:
+                       remote: origin
+                       name: "csit-verified"
+                       message: "Verified CSIT version for VPP testing"
+                       create-tag: true
+                       update-tag: true
 
 - job-template:
-    name: 'csit-vpp-master-verify-weekly'
+    name: 'csit-vpp-master-verify-semiweekly'
+    description: 'Purpose of this job is to validate latest vpp build stored in nexus against verified CSIT codebase.'
 
     project-type: freestyle
     node: verify
@@ -176,22 +201,24 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 0'
+        - timed: '0 4 * * 2,6'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'csit-verify-vpp'
+            name: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell:
-            !include-raw-escape jjb/csit/include-raw-csit-vpp-verify-master.sh
+            !include-raw-escape jjb/csit/include-raw-csit-vpp-master-verify-semiweekly.sh
 
     publishers:
-        - git:
-               push-only-if-success: true
-               tags:
-                   - tag:
-                       remote: origin
-                       name: "csit-verified"
-                       message: "Verified CSIT version for VPP testing"
-                       create-tag: true
-                       update-tag: true
+        - archive-artifacts:
+            artifacts: 'csit/archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit/archive'
 
 - parameter:
     name: test-type-parameter