summaryrefslogtreecommitdiffstats
path: root/jjb/qtip/qtip-validate-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/qtip/qtip-validate-jobs.yml')
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml29
1 files changed, 21 insertions, 8 deletions
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 4cd8490fd..deaf525af 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -23,22 +23,25 @@
# JOB VARIABLES
#--------------------------------
pod:
- - zte-pod2:
+ - zte-pod1:
installer: fuel
<<: *master
- zte-pod3:
installer: fuel
<<: *master
+ - zte-pod1:
+ installer: fuel
+ <<: *danube
- zte-pod3:
installer: fuel
<<: *danube
task:
- daily:
auto-builder-name: qtip-validate-deploy
- auto-trigger-name: 'qtip-daily-{pod}-trigger'
+ auto-trigger-name: 'qtip-{pod}-daily-{stream}-trigger'
- validate:
auto-builder-name: qtip-validate-setup
- auto-trigger-name: qtip-validate-trigger
+ auto-trigger-name: gerrit-trigger-change-merged
- experimental:
auto-builder-name: qtip-validate-setup
auto-trigger-name: experimental
@@ -58,7 +61,8 @@
parameters:
- qtip-common-parameters:
project: '{project}'
- <<: *master
+ branch: '{branch}'
+ docker-tag: '{docker-tag}'
- '{installer}-defaults'
- '{pod}-defaults'
- string:
@@ -82,7 +86,6 @@
#---------
# builder
#---------
-
- builder:
name: qtip-common-builders
builders:
@@ -136,14 +139,24 @@
#---------
- trigger:
- name: qtip-daily-zte-pod2-trigger
+ name: 'qtip-zte-pod1-daily-master-trigger'
+ triggers:
+ - timed: '30 0 * * *'
+
+- trigger:
+ name: 'qtip-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: '30 0 * * *'
+
+- trigger:
+ name: 'qtip-zte-pod1-daily-danube-trigger'
triggers:
- timed: '0 7 * * *'
- trigger:
- name: qtip-daily-zte-pod3-trigger
+ name: 'qtip-zte-pod3-daily-danube-trigger'
triggers:
- - timed: '0 1 * * *'
+ - timed: '0 7 * * *'
- trigger:
name: qtip-validate-trigger