summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2017-02-08 01:28:03 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 01:28:03 +0000
commit0ae37d142ae4ce27b6ae7d35b2ca7d48ba36475c (patch)
treee828e6e24ae7b1b08d00ce7109750a775e354e75 /jjb
parentacfcb609e3473eda5e86b4b7b16400f25898f1a3 (diff)
parent10edff38ca2fd1d1a4142cb8f082779989e8a0be (diff)
Merge "keep weekly-trigger-disabled and enable compass-dovetail weekly trigger"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-dovetail-jobs.yml9
-rw-r--r--jjb/global/releng-macros.yml4
2 files changed, 9 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index 0fd2f9e66..46570cc6b 100644
--- 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 06152fe6b..7e11d92f6 100644
--- 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: