Enable daisy HA deployment job

In patch https://gerrit.opnfv.org/gerrit/#/c/36873/ daisy noha jobs
were added since the HA function is not perfect at that time.
Now the issues have been fixed and HA function can be enabled.

Change-Id: I1fc9a235191ba47e8473ae8a429994dc36cca955
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 592e54d..6524d20 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -46,10 +46,10 @@
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
         # ODL_L3 scenarios
-        - 'os-odl_l3-nofeature-noha':
+        - 'os-odl_l3-nofeature-ha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
         # ODL_L2 scenarios
-        - 'os-odl_l2-nofeature-noha':
+        - 'os-odl_l2-nofeature-ha':
             auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
@@ -150,7 +150,7 @@
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
+            default: 'os-nosdn-nofeature-ha'
         - 'daisy-project-parameter':
             gs-pathname: '{gs-pathname}'
         - string:
@@ -184,20 +184,20 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 12 * * *'
 # NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
-        - timed: 'H 12 * * *'
+        - timed: ''
 # ODL_L3 Scenarios
 - trigger:
-    name: 'daisy-os-odl_l3-nofeature-noha-baremetal-daily-master-trigger'
+    name: 'daisy-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-        - timed: 'H 16 * * *'
+        - timed: '0 16 * * *'
 # ODL_L2 Scenarios
 - trigger:
-    name: 'daisy-os-odl_l2-nofeature-noha-baremetal-daily-master-trigger'
+    name: 'daisy-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 #-----------------------------------------------
@@ -206,20 +206,20 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 12 * * *'
 # NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
-        - timed: 'H 12 * * *'
+        - timed: ''
 # ODL_L3 Scenarios
 - trigger:
-    name: 'daisy-os-odl_l3-nofeature-noha-virtual-daily-master-trigger'
+    name: 'daisy-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: 'H 16 * * *'
+        - timed: '0 16 * * *'
 # ODL_L3 Scenarios
 - trigger:
-    name: 'daisy-os-odl_l2-nofeature-noha-virtual-daily-master-trigger'
+    name: 'daisy-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 57e44e3..bae75dd 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -161,7 +161,7 @@
             description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
+            default: 'os-nosdn-nofeature-ha'
         - '{installer}-project-parameter':
             gs-pathname: '{gs-pathname}'