summaryrefslogtreecommitdiffstats
path: root/jjb/yardstick
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-04-06 18:05:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-06 18:05:05 +0000
commit34fdd5026155a29f530bbfd3c765639bebde3b25 (patch)
treef4de7a9b4d6ccb9dc62bfb3484fdb5e3b9406818 /jjb/yardstick
parent58126f06600112dd592a9c8776cca7770580ac8f (diff)
parent990b531fe476d670a1a5aede63618fce4a6a4dfc (diff)
Merge "Create Stable Branch Jobs for yardstick"
Diffstat (limited to 'jjb/yardstick')
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml34
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml5
2 files changed, 20 insertions, 19 deletions
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 24c7f319b..2eaa0feb1 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -15,8 +15,8 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
gs-pathname: '{stream}'
docker-tag: 'stable'
@@ -41,15 +41,15 @@
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
- slave-label: apex-virtual-euphrates
+ slave-label: apex-virtual-fraser
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- baremetal:
- slave-label: apex-baremetal-euphrates
+ slave-label: apex-baremetal-fraser
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# fuel CI PODs
- baremetal:
slave-label: fuel-baremetal
@@ -65,12 +65,12 @@
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@ -86,12 +86,12 @@
slave-label: armband-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- armband-virtual:
slave-label: armband-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -107,12 +107,12 @@
slave-label: joid-baremetal
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: joid-virtual
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -128,12 +128,12 @@
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# daisy CI PODs
- baremetal:
slave-label: daisy-baremetal
@@ -162,7 +162,7 @@
slave-label: '{pod}'
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- zte-pod2:
slave-label: '{pod}'
installer: daisy
@@ -330,7 +330,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-apex-virtual-euphrates'
+ name: 'yardstick-params-apex-virtual-fraser'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -338,7 +338,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-apex-baremetal-euphrates'
+ name: 'yardstick-params-apex-baremetal-fraser'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 7987a329a..56e825e19 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -17,7 +17,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
+ - fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -87,7 +87,8 @@
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
- description: "Directory where the build artifact will be located upon the completion of the build."
+ description: "Directory where the build artifact will be located upon\
+ \ the completion of the build."
scm:
- git-scm