dovetail: Change CI jobs to run test suite "proposed_tests" instead of "debug"

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index e7982ba..3241af8 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -443,7 +443,16 @@
             git-revision: false
             same-node: true
             block: true
-        - 'apex-upload-artifact'
+        - 'apex-upload-rpm-artifact'
+        - trigger-builds:
+          - project: 'apex-iso-verify-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: false
+            block: true
+            same-node: true
+        - 'apex-upload-iso-artifact'
 
 - job-template:
     name: 'apex-deploy-virtual-{scenario}-{stream}'
@@ -616,7 +625,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
@@ -1013,8 +1022,7 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - shell:
-            !include-raw-escape: ./apex-upload-artifact.sh
+        - 'apex-upload-snapshot-artifact'
 
 # FDIO promote
 - job-template:
@@ -1062,8 +1070,7 @@
             same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
-        - shell:
-            !include-raw-escape: ./apex-upload-artifact.sh
+        - 'apex-upload-snapshot-artifact'
 
 - job-template:
     name: 'apex-gs-clean-{stream}'
@@ -1147,10 +1154,25 @@
             !include-raw: ./apex-workspace-cleanup.sh
 
 - builder:
-    name: 'apex-upload-artifact'
+    name: 'apex-iso-verify'
     builders:
         - shell:
-            !include-raw: ./apex-upload-artifact.sh
+            !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'
+    builders:
+        - shell: ./apex-upload-artifact.sh rpm
 
 - builder:
     name: 'apex-gs-cleanup'