Merge "compass: Align scenario short names"

[releng.git] / jjb / compass4nfv / compass-project-jobs.yml

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index e5039db..565aaa3 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -15,25 +15,25 @@
             gs-pathname: '/{stream}'
 
 
-    sdn-controller:
-        - 'nosdn':
+    scenario:
+        - 'os-nosdn-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-        - 'odl':
+        - 'os-odl_l2-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-        - 'onos':
+        - 'os-onos-nofeature-ha':
             disabled: false
             node: huawei-deploy-vm
-        - 'opencontrail':
-            disabled: true
-            node: huawei-deploy-vm
+#        - 'os-ocl-nofeature-ha':
+#            disabled: true
+#            node: huawei-deploy-vm
 
     jobs:
         - 'compass-verify-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-deploy-virtual-{sdn-controller}-{stream}'
+        - 'compass-deploy-virtual-{scenario}-{stream}'
         - 'compass-virtual-daily-{stream}'
 
 ########################
@@ -64,6 +64,9 @@
             gs-pathname: '{gs-pathname}'
         - '{node}-defaults'
         - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
 
     scm:
         - gerrit-trigger-scm:
@@ -95,9 +98,9 @@
 
     builders:
         - shell:
-            !include-raw ./compass-build.sh
+            !include-raw: ./compass-build.sh
         - shell:
-            !include-raw ./compass-deploy-virtual.sh
+            !include-raw: ./compass-deploy-virtual.sh
 
     publishers:
         - archive:
@@ -134,7 +137,7 @@
             branch: '{branch}'
 
     triggers:
-        - timed: 'H 16 * * *'
+        - timed: 'H 14 * * *'
 
     builders:
         - trigger-builds:
@@ -142,15 +145,15 @@
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'compass-deploy-virtual-nosdn-{stream}'
+          - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
             git-revision: true
             block: false
         - trigger-builds:
-          - project: 'compass-deploy-virtual-odl-{stream}'
+          - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
             git-revision: true
             block: false
         - trigger-builds:
-          - project: 'compass-deploy-virtual-onos-{stream}'
+          - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}'
             git-revision: true
             block: false
 
@@ -184,11 +187,11 @@
 
     builders:
         - shell:
-            !include-raw ./compass-build.sh
+            !include-raw: ./compass-build.sh
         - shell:
-            !include-raw ./compass-upload-artifact.sh
+            !include-raw: ./compass-upload-artifact.sh
         - shell:
-            !include-raw ./compass-workspace-cleanup.sh
+            !include-raw: ./compass-workspace-cleanup.sh
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
@@ -221,10 +224,10 @@
 
     builders:
         - shell:
-            !include-raw ./compass-makeppa.sh
+            !include-raw: ./compass-makeppa.sh
 
 - job-template:
-    name: 'compass-deploy-virtual-{sdn-controller}-{stream}'
+    name: 'compass-deploy-virtual-{scenario}-{stream}'
 
     disabled: false
 
@@ -244,22 +247,19 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'none'
+            default: '{scenario}'
         - '{node}-defaults'
         - '{installer}-defaults'
 
     builders:
         - shell:
-            !include-raw ./compass-workspace-precleanup.sh
+            !include-raw: ./compass-workspace-precleanup.sh
         - shell:
-            !include-raw ./compass-download-artifact.sh
+            !include-raw: ./compass-download-artifact.sh
         - shell:
-            !include-raw ./compass-deploy-virtual.sh
+            !include-raw: ./compass-deploy-virtual.sh
 
     publishers:
         - archive: