From 25d99dbc0c41217abd369a48fce1f69d636b7134 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Thu, 7 Sep 2017 22:26:44 -0400
Subject: Jobs on Compass often timeout

1. Jobs on Compass often timeout
2. Apex jobs on huawei-pod4 will trigger 2 jobs at the same time. They will be
   conflict.

JIRA: DOVETAIL-491

Change-Id: I5297bfb01c45c15cce7ab1438d8eed3dd9c7ff07
Signed-off-by: xudan <xudan16@huawei.com>
---
 jjb/dovetail/dovetail-ci-jobs.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'jjb/dovetail')

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index c13c93859..32cfcfa19 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -165,7 +165,7 @@
         - huawei-pod4:
             slave-label: huawei-pod4
             SUT: apex
-            auto-trigger-name: 'apex-huawei-pod4-danube-trigger'
+            auto-trigger-name: 'apex-huawei-pod4-{testsuite}-danube-trigger'
             <<: *danube
 #--------------------------------
     testsuite:
@@ -196,7 +196,7 @@
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 240
+            timeout: 300
             abort: true
         - fix-workspace-permissions
 
@@ -268,6 +268,10 @@
 # trigger macros
 #--------------------------
 - trigger:
-    name: 'apex-huawei-pod4-danube-trigger'
+    name: 'apex-huawei-pod4-proposed_tests-danube-trigger'
     triggers:
-        - timed: '* 1 * * *'
+        - timed: '0 1 * * *'
+- trigger:
+    name: 'apex-huawei-pod4-compliance_set-danube-trigger'
+    triggers:
+        - timed: ''
-- 
cgit 1.2.3-korg