add cperf specific stream to apex-runner-cperf job

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 32cbcd7..89965d7 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -2,6 +2,7 @@
     name: apex
     jobs:
         - 'apex-verify-{stream}'
+        - 'apex-verify-unit-tests-{stream}'
         - 'apex-runner-{platform}-{scenario}-{stream}'
         - 'apex-runner-cperf-{stream}'
         - 'apex-build-{stream}'
@@ -68,6 +69,62 @@
          - 'baremetal'
          - 'virtual'
 
+# Unit Test
+- job-template:
+    name: 'apex-verify-unit-tests-{stream}'
+
+    node: '{verify-slave}'
+
+    concurrent: true
+
+    parameters:
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'apex'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'tests/**'
+    properties:
+        - throttle:
+            max-per-node: 1
+            max-total: 10
+            option: 'project'
+
+    builders:
+        - 'apex-unit-test'
+
 # Verify
 - job-template:
     name: 'apex-verify-{stream}'
@@ -131,7 +188,7 @@
                 - 'apex-deploy.*'
                 - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify'
+                - 'apex-verify.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -203,8 +260,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'apex-daily.*{stream}'
-                - 'apex-verify.*{stream}'
+                - 'apex-daily.*'
+                - 'apex-verify.*'
 
     builders:
         - trigger-builds:
@@ -277,6 +334,7 @@
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
+            same-node: true
         - trigger-builds:
           - project: 'cperf-apex-intel-pod2-daily-{stream}'
             predefined-parameters:
@@ -321,7 +379,7 @@
             use-build-blocker: true
             block-level: 'NODE'
             blocking-jobs:
-                - 'apex-deploy.*{stream}'
+                - 'apex-deploy.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -378,7 +436,7 @@
             use-build-blocker: true
             block-level: 'NODE'
             blocking-jobs:
-                - 'apex-deploy.*{stream}'
+                - 'apex-deploy.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -421,9 +479,9 @@
             use-build-blocker: true
             block-level: 'NODE'
             blocking-jobs:
-                - 'apex-verify.*{stream}'
-                - 'apex-deploy.*{stream}'
-                - 'apex-build.*{stream}'
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-build.*'
 
 
     builders:
@@ -460,10 +518,10 @@
             use-build-blocker: true
             block-level: 'NODE'
             blocking-jobs:
-                - 'apex-verify.*{stream}'
-                - 'apex-deploy.*{stream}'
-                - 'apex-build.*{stream}'
-                - 'apex-runner.*{stream}'
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-build.*'
+                - 'apex-runner.*'
 
     triggers:
         - 'apex-{stream}'
@@ -836,6 +894,10 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where opnfv artifacts are stored in gs repository"
         - string:
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}