Fix trigger for validate tasks

[releng.git] / jjb / qtip / qtip-validate-jobs.yml

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 10ee72a..b8d2089 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -13,6 +13,11 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: latest
+    danube: &danube
+        stream: danube
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        docker-tag: 'stable'
 
 #--------------------------------
 # JOB VARIABLES
@@ -24,13 +29,16 @@
         - zte-pod3:
             installer: fuel
             <<: *master
+        - zte-pod3:
+            installer: fuel
+            <<: *danube
     task:
         - daily:
             auto-builder-name: qtip-validate-deploy
             auto-trigger-name: 'qtip-daily-{pod}-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
@@ -50,9 +58,14 @@
     parameters:
         - qtip-common-parameters:
             project: '{project}'
-            <<: *master
+            branch: '{branch}'
+            docker-tag: '{docker-tag}'
         - '{installer}-defaults'
         - '{pod}-defaults'
+        - string:
+            name: CI_DEBUG
+            default: 'false'
+            description: "Show debug output information"
     scm:
         - git-scm
     triggers:
@@ -70,7 +83,6 @@
 #---------
 # builder
 #---------
-
 - builder:
     name: qtip-common-builders
     builders:
@@ -132,11 +144,3 @@
     name: qtip-daily-zte-pod3-trigger
     triggers:
         - timed: '0 1 * * *'
-
-- trigger:
-    name: qtip-validate-trigger
-    triggers:
-        - gerrit-trigger-change-merged:
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'