From 238fe1bced27354a9f1c2553dd09ce7739a33b34 Mon Sep 17 00:00:00 2001
From: zhihui wu <wu.zhihui1@zte.com.cn>
Date: Thu, 1 Mar 2018 09:49:28 +0800
Subject: modify qtip job template
The parameter 'SUT' is meaningless to storage job and experiment
job.
Change-Id: I40322962111896773821b8ef2f05e6f330d7da00
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
---
jjb/qtip/qtip-experimental-jobs.yml | 14 ++------------
jjb/qtip/qtip-validate-jobs.yml | 15 ++++++---------
2 files changed, 8 insertions(+), 21 deletions(-)
(limited to 'jjb/qtip')
diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index ee143b4f3..b130912f3 100644
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
name: qtip-experimental-jobs
project: qtip
jobs:
- - 'qtip-{sut}-experimental-{pod}-{stream}'
+ - 'qtip-experimental-{pod}-{stream}'
stream:
- master:
branch: '{stream}'
@@ -19,19 +19,12 @@
installer: fuel
pod: zte-virtual6
- # -------------------------------
- # SYSTEM UNDER TEST
- # -------------------------------
- sut:
- - 'host'
- - 'vnf'
-
################################
## job templates
#################################
- job-template:
- name: 'qtip-{sut}-experimental-{pod}-{stream}'
+ name: 'qtip-experimental-{pod}-{stream}'
disabled: '{obj:disabled}'
@@ -41,9 +34,6 @@
branch: '{branch}'
- '{installer}-defaults'
- '{pod}-defaults'
- - string:
- name: SUT
- default: '{sut}'
scm:
- git-scm-gerrit
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 282cb93e2..5c0bb881b 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -27,34 +27,30 @@
- compute:
installer: apex
pod: zte-virtual5
+ sut: node
<<: *master
- storage:
installer: apex
pod: zte-virtual5
+ sut: ''
<<: *master
- compute:
installer: fuel
pod: zte-virtual6
+ sut: vnf
<<: *master
- # -------------------------------
- # SYSTEM UNDER TEST
- # -------------------------------
- sut:
- - 'host'
- - 'vnf'
-
# -------------------------------
# JOB LIST
# -------------------------------
jobs:
- - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+ - 'qtip-{qpi}-{installer}-{pod}-{stream}'
################################
# job templates
################################
- job-template:
- name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+ name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
disabled: false
parameters:
@@ -85,6 +81,7 @@
default: '{stream}'
- string:
name: SUT
+ description: "System Under Test"
default: '{sut}'
scm:
- git-scm
--
cgit