summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml2
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml31
2 files changed, 27 insertions, 6 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 3e79ae85d..b65b2c0dd 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -1140,7 +1140,7 @@
- trigger:
name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-danube-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: '0 2 * * *'
- trigger:
name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-danube-trigger'
triggers:
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index b8d2089d4..deaf525af 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -23,19 +23,22 @@
# 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: gerrit-trigger-change-merged
@@ -136,11 +139,29 @@
#---------
- 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
+ triggers:
+ - gerrit-trigger-change-merged:
+ project: '{project}'
+ branch: '{branch}'
+ files: '**'