diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-08-16 15:51:15 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-08-17 12:00:12 +0800 |
| commit | ca02d5fda706a7e10f5f23536da0ceae79d42e2e (patch) | |
| tree | 8b225d2422f55934818806bdadc182374cffa365 /jjb/qtip/qtip-validate-jobs.yml | |
| parent | 63bfdf7e1ae7cd5f2591e7ecf9a17fcd49f85fb1 (diff) | |
[qtip] refactoring ci scripts
- manage help scripts in qtip repo instead of releng
- call entry script in qtip from releng
JIRA: QTIP-268
Change-Id: Ibd0d2c2533c1a7f1963f6c3214c563499cce8b22
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'jjb/qtip/qtip-validate-jobs.yml')
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index 73d7993c9..e64173ca7 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -17,27 +17,27 @@ #-------------------------------- # JOB VARIABLES #-------------------------------- - pod: - - zte-pod1: - installer: fuel - scenario: os-odl_l2-nofeature-ha + qpi: + - compute: + installer: apex + pod: zte-pod4 <<: *master - - zte-pod3: - installer: fuel - scenario: os-nosdn-kvm-ha + - storage: + installer: apex + pod: zte-pod4 <<: *master #-------------------------------- # JOB LIST #-------------------------------- jobs: - - 'qtip-{scenario}-{pod}-daily-{stream}' + - 'qtip-{qpi}-{installer}-{stream}' ################################ # job templates ################################ - job-template: - name: 'qtip-{scenario}-{pod}-daily-{stream}' + name: 'qtip-{qpi}-{installer}-{stream}' disabled: false parameters: - project-parameter: @@ -47,7 +47,7 @@ - '{pod}-defaults' - string: name: DEPLOY_SCENARIO - default: '{scenario}' + default: generic - string: name: DOCKER_TAG default: '{docker-tag}' @@ -56,14 +56,19 @@ name: CI_DEBUG default: 'false' description: "Show debug output information" + - string: + name: TEST_SUITE + default: '{qpi}' scm: - git-scm triggers: - - 'qtip-{scenario}-{pod}-daily-{stream}-trigger' + - 'qtip-daily' 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 @@ -75,14 +80,6 @@ #--------- # builder #--------- -- builder: - name: qtip-validate-deploy - builders: - - shell: - !include-raw: ./helpers/cleanup-deploy.sh - - shell: - !include-raw: ./helpers/validate-deploy.sh - #----------- # parameter @@ -103,11 +100,6 @@ #--------- - 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 * * *' |