dovetail: add a suitable job used for vpn test case validation in CI

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index e7982ba..7ca2e6e 100644 (file)
--- 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,8 +444,64 @@
             git-revision: false
             same-node: true
             block: true
+        - inject:
+           properties-content: ARTIFACT_TYPE=rpm
+        - 'apex-upload-artifact'
+        - trigger-builds:
+          - project: 'apex-verify-iso-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+            git-revision: false
+            block: true
+            same-node: true
+        - 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}'
 
@@ -616,7 +673,7 @@
         # 4.not used for release criteria or compliance,
         #   only to debug the dovetail tool bugs with apex
         #- trigger-builds:
-        #    - project: 'dovetail-apex-{slave}-debug-{stream}'
+        #    - project: 'dovetail-apex-{slave}-proposed_tests-{stream}'
         #      current-parameters: false
         #      predefined-parameters:
         #        DEPLOY_SCENARIO=os-nosdn-nofeature-ha
@@ -807,7 +864,7 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l3-fdio-noha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l3-fdio-ha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
@@ -819,7 +876,7 @@
         - trigger-builds:
           - project: 'functest-apex-{daily-slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l3-fdio-ha
             block: true
             same-node: true
             block-thresholds:
@@ -829,7 +886,7 @@
         - trigger-builds:
           - project: 'yardstick-apex-{slave}-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+              DEPLOY_SCENARIO=os-odl_l3-fdio-ha
             block: true
             same-node: true
             block-thresholds:
@@ -1013,8 +1070,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - shell:
-            !include-raw-escape: ./apex-upload-artifact.sh
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 # FDIO promote
 - job-template:
@@ -1062,8 +1120,9 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - shell:
-            !include-raw-escape: ./apex-upload-artifact.sh
+        - inject:
+           properties-content: ARTIFACT_TYPE=snapshot
+        - 'apex-upload-artifact'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'
@@ -1146,6 +1205,13 @@
         - shell:
             !include-raw: ./apex-workspace-cleanup.sh
 
+- builder:
+    name: 'apex-iso-verify'
+    builders:
+        - shell:
+            !include-raw: ./apex-iso-verify.sh
+
+
 - builder:
     name: 'apex-upload-artifact'
     builders: