From: mei mei <meimei@huawei.com>
Date: Fri, 19 Aug 2016 08:43:50 +0000 (+0000)
Subject: Merge "Added job for nosdn noha scenario and autorun it daily."
X-Git-Tag: colorado.1.0~145
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f4eed5da56d2ab5e2ca7c3e2d269c443480a00b0;hp=0f7c6ec50c15197d2d040aa1ea5ef18cde0fc4e7;p=releng.git

Merge "Added job for nosdn noha scenario and autorun it daily."
---

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 1c998c9c4..ab4d7c5b6 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -54,11 +54,11 @@
 # new scenario descriptions
     scenario:
         - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-nofeature-ha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-lxd-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-lxd-noha':
             auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
@@ -426,3 +426,39 @@
     name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''
+
+# os-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 4 * * *'
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-master-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-nofeature-noha trigger - branch: stable/brahmaputra
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-juniper-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''