1 files changed, 61 insertions, 17 deletions

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 3241af826..56eac78e6 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -12,6 +12,7 @@
         - 'apex-daily-{stream}'
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
+        - 'apex-verify-iso-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -443,16 +444,63 @@
             git-revision: false
             same-node: true
             block: true
-        - 'apex-upload-rpm-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=rpm
+        - 'apex-upload-artifact'
         - trigger-builds:
-          - project: 'apex-iso-verify-{stream}'
+          - project: 'apex-verify-iso-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/.build
-              OPNFV_CLEAN=yes
             git-revision: false
             block: true
             same-node: true
-        - 'apex-upload-iso-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=iso
+        - 'apex-upload-artifact'
+
+# ISO verify job
+- job-template:
+    name: 'apex-verify-iso-{stream}'
+
+    # Job template for builds
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: '{daily-slave}'
+
+    disabled: false
+
+    concurrent: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - git-scm
+
+    properties:
+        - logrotate-default
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-deploy.*'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
+            option: 'project'
+
+    builders:
+        - 'apex-iso-verify'
 
 - job-template:
     name: 'apex-deploy-virtual-{scenario}-{stream}'
@@ -1022,7 +1070,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - 'apex-upload-snapshot-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 # FDIO promote
 - job-template:
@@ -1070,7 +1120,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - 'apex-upload-snapshot-artifact'
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'
@@ -1159,20 +1211,12 @@
         - shell:
             !include-raw: ./apex-iso-verify.sh
 
-- builder:
-    name: 'apex-upload-snapshot-artifact'
-    builders:
-        - shell: ./apex-upload-artifact.sh snapshot
-
-- builder:
-    name: 'apex-upload-iso-artifact'
-    builders:
-        - shell: ./apex-upload-artifact.sh iso
 
 - builder:
-    name: 'apex-upload-rpm-artifact'
+    name: 'apex-upload-artifact'
     builders:
-        - shell: ./apex-upload-artifact.sh rpm
+        - shell:
+            !include-raw: ./apex-upload-artifact.sh
 
 - builder:
     name: 'apex-gs-cleanup'