Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "bug fix for qtip reporting"
[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
73d7993
..
e64173c
100644
(file)
--- a/
jjb/qtip/qtip-validate-jobs.yml
+++ b/
jjb/qtip/qtip-validate-jobs.yml
@@
-17,27
+17,27
@@
#--------------------------------
# JOB VARIABLES
#--------------------------------
#--------------------------------
# JOB VARIABLES
#--------------------------------
-
pod
:
- -
zte-pod1
:
- installer:
fuel
- scenario: os-odl_l2-nofeature-ha
+
qpi
:
+ -
compute
:
+ installer:
apex
+ pod: zte-pod4
<<: *master
<<: *master
- -
zte-pod3
:
- installer:
fuel
- scenario: os-nosdn-kvm-ha
+ -
storage
:
+ installer:
apex
+ pod: zte-pod4
<<: *master
#--------------------------------
# JOB LIST
#--------------------------------
jobs:
<<: *master
#--------------------------------
# JOB LIST
#--------------------------------
jobs:
- - 'qtip-{
scenario}-{pod}-daily
-{stream}'
+ - 'qtip-{
qpi}-{installer}
-{stream}'
################################
# job templates
################################
- job-template:
################################
# job templates
################################
- job-template:
- name: 'qtip-{
scenario}-{pod}-daily
-{stream}'
+ name: 'qtip-{
qpi}-{installer}
-{stream}'
disabled: false
parameters:
- project-parameter:
disabled: false
parameters:
- project-parameter:
@@
-47,7
+47,7
@@
- '{pod}-defaults'
- string:
name: DEPLOY_SCENARIO
- '{pod}-defaults'
- string:
name: DEPLOY_SCENARIO
- default:
'{scenario}'
+ default:
generic
- string:
name: DOCKER_TAG
default: '{docker-tag}'
- string:
name: DOCKER_TAG
default: '{docker-tag}'
@@
-56,14
+56,19
@@
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
name: CI_DEBUG
default: 'false'
description: "Show debug output information"
+ - string:
+ name: TEST_SUITE
+ default: '{qpi}'
scm:
- git-scm
triggers:
scm:
- git-scm
triggers:
- - 'qtip-
{scenario}-{pod}-daily-{stream}-trigger
'
+ - 'qtip-
daily
'
builders:
- description-setter:
description: "POD: $NODE_NAME"
builders:
- description-setter:
description: "POD: $NODE_NAME"
- - qtip-validate-deploy
+ - shell: |
+ #!/bin/bash
+ source tests/ci/periodic.sh
publishers:
- qtip-common-publishers
- email-jenkins-admins-on-failure
publishers:
- qtip-common-publishers
- email-jenkins-admins-on-failure
@@
-75,14
+80,6
@@
#---------
# builder
#---------
#---------
# builder
#---------
-- builder:
- name: qtip-validate-deploy
- builders:
- - shell:
- !include-raw: ./helpers/cleanup-deploy.sh
- - shell:
- !include-raw: ./helpers/validate-deploy.sh
-
#-----------
# parameter
#-----------
# parameter
@@
-103,11
+100,6
@@
#---------
- trigger:
#---------
- trigger:
- name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
- triggers:
- - timed: '0 15 * * *'
-
-- trigger:
- name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-master-trigger'
+ name: 'qtip-daily'
triggers:
- timed: '0 15 * * *'
triggers:
- timed: '0 15 * * *'