Merge "docs: adds genesisreq to docs merge job targets"

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 11e1d5f..2c38f58 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -82,6 +82,9 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index c24608f..1e6e7ae 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -49,7 +49,7 @@
     scenario:
         # HA scenarios
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
@@ -319,7 +319,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 4,10,16,22 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
     triggers:
@@ -327,7 +327,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1,7,13,19 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -337,7 +337,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 11,23 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -371,7 +371,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 5,17 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:

diff --git a/utils/test/result_collection_api/resources/handlers.py b/utils/test/result_collection_api/resources/handlers.py
index be08c97..6443fc4 100644 (file)
--- a/utils/test/result_collection_api/resources/handlers.py
+++ b/utils/test/result_collection_api/resources/handlers.py
@@ -552,7 +552,7 @@ class TestResultsHandler(GenericApiHandler):
 
                 if period_arg > 0:
                     period = datetime.now() - timedelta(days=period_arg)
-                    obj = {"$gte": period}
+                    obj = {"$gte": str(period)}
                     get_request["creation_date"] = obj
         else:
             get_request["_id"] = result_id
@@ -705,7 +705,7 @@ class DashboardHandler(GenericApiHandler):
                     raise HTTPError(HTTP_BAD_REQUEST)
                 if period_arg > 0:
                     period = datetime.now() - timedelta(days=period_arg)
-                    obj = {"$gte": period}
+                    obj = {"$gte": str(period)}
                     get_request["creation_date"] = obj
         else:
             get_request["_id"] = result_id