From c88d6ff55eb677b5a985d90c9ac7edf792a09e95 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Mon, 20 Mar 2017 23:53:38 +0800
Subject: qtip: fix daily job failure

Parameter BRANCH is not correct in danube daily job[1]: expected `stable/danube`, actual `danube`

The following corrections are made as an attempt to fix this issue

- enable CI_DEBUG for additional information
- inline qtip-common-parameters

[1]: https://build.opnfv.org/ci/view/qtip/job/qtip-daily-fuel-zte-pod3-danube/7/parameters/

Change-Id: Ia892371925ffdb817d663c134d16e4568c07dff7
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 jjb/qtip/qtip-validate-jobs.yml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'jjb/qtip')

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index deaf525af..80b08e6a3 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -59,15 +59,21 @@
     name: 'qtip-{task}-{installer}-{pod}-{stream}'
     disabled: false
     parameters:
-        - qtip-common-parameters:
+        - project-parameter:
             project: '{project}'
             branch: '{branch}'
-            docker-tag: '{docker-tag}'
         - '{installer}-defaults'
         - '{pod}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
         - string:
             name: CI_DEBUG
-            default: 'false'
+            default: 'true'
             description: "Show debug output information"
     scm:
         - git-scm
@@ -110,20 +116,6 @@
 # parameter
 #-----------
 
-- parameter:
-    name: qtip-common-parameters
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-
 #-----------
 # publisher
 #-----------
-- 
cgit 1.2.3-korg