summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml37
1 files changed, 31 insertions, 6 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index d1e9850fc..d2f251d36 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -25,55 +25,69 @@
pod:
- opnfv-jump-1:
installer: apex
+ suite: daily
<<: *brahmaputra
- opnfv-jump-2:
installer: fuel
+ suite: daily
<<: *brahmaputra
- intel-pod5:
installer: joid
+ suite: daily
<<: *brahmaputra
- huawei-us-deploy-bare-1:
installer: compass
+ suite: daily
<<: *brahmaputra
- ericsson-pod1:
installer: fuel
+ suite: daily
<<: *brahmaputra
#--------------------------------
# master
#--------------------------------
- ericsson-pod1:
installer: fuel
+ suite: daily
+ <<: *master
+ - ericsson-pod1:
+ installer: fuel
+ suite: vtcdaily
<<: *master
- ericsson-pod2:
installer: fuel
+ suite: daily
<<: *master
- intel-pod6:
installer: joid
+ suite: daily
<<: *master
- intel-pod8:
installer: compass
+ suite: daily
<<: *master
- zte-build-1:
installer: fuel
+ suite: daily
<<: *master
- orange-pod2:
installer: joid
+ suite: daily
<<: *master
- opnfv-jump-1:
installer: apex
+ suite: daily
<<: *master
#--------------------------------
- loop:
- - daily
jobs:
- - 'yardstick-{installer}-{pod}-{loop}-{stream}'
+ - 'yardstick-{installer}-{pod}-{suite}-{stream}'
################################
# job templates
################################
- job-template:
- name: 'yardstick-{installer}-{pod}-{loop}-{stream}'
+ name: 'yardstick-{installer}-{pod}-{suite}-{stream}'
disabled: false
@@ -95,7 +109,7 @@
default: 'os-odl_l2-nofeature-ha'
- string:
name: YARDSTICK_SUITE_NAME
- default: opnfv_${{NODE_NAME}}_{loop}.yaml
+ default: opnfv_${{NODE_NAME}}_{suite}.yaml
description: 'Path to test suite'
- string:
name: CI_DEBUG
@@ -111,7 +125,7 @@
builders:
- 'yardstick-cleanup'
#- 'yardstick-fetch-os-creds'
- - 'yardstick-daily'
+ - 'yardstick-{suite}'
publishers:
- email:
@@ -166,6 +180,17 @@
echo "Yardstick: done!"
- builder:
+ name: yardstick-vtcdaily
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -e
+ [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+ cd $WORKSPACE
+ ./ci/apexlake-verify
+
+- builder:
name: yardstick-fetch-os-creds
builders:
- shell: