summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-24 11:18:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-24 11:18:03 +0000
commit6c4fbc826fda92f792c15e542d4a0f3e49afe610 (patch)
tree21b0c0657ef7cb68e88044b1849625199368b651
parent4975d04ccfab91e1d4f9e4e8fdb5d8f469e80782 (diff)
parent64e2822d21b30086a039fe907fbbb17f00a9799f (diff)
Merge "qtip: remove brahmaputra jobs and change branch/pod allocation"
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml23
1 files changed, 8 insertions, 15 deletions
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 1123d27fb..d454b0f07 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -13,27 +13,20 @@
stream: master
branch: '{stream}'
gs-pathname: ''
- brahmaputra: &brahmaputra
- stream: brahmaputra
- branch: 'stable/{stream}'
- gs-pathname: '{stream}'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# master
#--------------------------------
pod:
- dell-pod1:
installer: compass
- auto-trigger-name: 'qtip-daily-dell-pod1-trigger'
- <<: *brahmaputra
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
- orange-pod2:
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
-#--------------------------------
-# master
-#--------------------------------
+ <<: *master
- juniper-pod1:
installer: joid
<<: *master
@@ -172,10 +165,10 @@
#trigger macros
#################
-- trigger:
- name: 'qtip-daily-dell-pod1-trigger'
- triggers:
- - timed: '0 3 * * *'
+#- trigger:
+# name: 'qtip-daily-dell-pod1-trigger'
+# triggers:
+# - timed: '0 3 * * *'
#- trigger:
# name: 'qtip-daily-juniper-pod1-trigger'