Merge "keep weekly-trigger-disabled and enable compass-dovetail weekly trigger"

diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index 0fd2f9e..46570cc 100644 (file)
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -28,7 +28,7 @@
     scenario:
         - 'os-nosdn-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'dovetail-weekly-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-weekly-{stream}'
@@ -206,4 +206,9 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-colorado-trigger'
     triggers:
-        - timed: ''
+        - timed: 'H H * * 0'
+
+- trigger:
+    name: 'dovetail-weekly-trigger'
+    triggers:
+        - timed: 'H H * * 0'

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 06152fe..7e11d92 100644 (file)
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -68,9 +68,9 @@
         - timed: ''
 
 - trigger:
-    name: 'dovetail-weekly-trigger'
+    name: 'weekly-trigger-disabled'
     triggers:
-        - timed: 'H H * * 0'
+        - timed: ''
 
 # NOTE: unused macro, but we may use this for some jobs.
 - trigger: