summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/genesis/genesis-foreman.yml10
-rw-r--r--jjb/genesis/genesis-fuel.yml10
-rw-r--r--jjb/yardstick/yardstick.yml85
3 files changed, 36 insertions, 69 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index bbeae8851..26f0a4035 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -205,9 +205,17 @@
- trigger-builds:
- project: 'functest-foreman-{stream}'
block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- trigger-builds:
- - project: 'yardstick-opnfv-jump-2'
+ - project: 'yardstick-foreman-{stream}'
block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'genesis-foreman-deploy-runner-{stream}'
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 2240571f0..a30c279d3 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -208,9 +208,17 @@
- trigger-builds:
- project: 'functest-fuel-{stream}'
block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- trigger-builds:
- - project: 'yardstick-opnfv-jump-2'
+ - project: 'yardstick-fuel-{stream}'
block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'genesis-fuel-deploy-runner-{stream}'
diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index d85d14e58..0365ff294 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -1,82 +1,31 @@
- project:
name: yardstick
- jobs:
- - 'yardstick-{pod}'
- - 'yardstick-daily-{stream}'
- - 'yardstick-merge'
- - 'yardstick-verify'
- pod:
- - opnfv-jump-1:
- node: 'opnfv-jump-1'
+ installer:
+ - fuel:
+ node: 'opnfv-jump-2'
installer_type: 'fuel'
installer_ip: '10.20.0.2'
- - opnfv-jump-2:
+ - foreman:
node: 'opnfv-jump-2'
installer_type: 'foreman'
installer_ip: '172.30.10.73'
+ jobs:
+ - 'yardstick-{installer}-{stream}'
+ - 'yardstick-merge'
+ - 'yardstick-verify'
+
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
stream:
- master:
branch: 'master'
+ - stable-arno:
+ branch: 'stable/arno'
+ gs-pathname: '/arno'
project: 'yardstick'
- somevar: 'foo'
-
-- job-template:
- name: 'yardstick-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- node: ericsson-build
-
- project-type: freestyle
- varsetabove: '{somevar}'
-
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- wrappers:
- - ssh-agent-credentials:
- user: '{ssh-credentials}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from yardstick {somevar} daily"
-
- postbuilders:
- - test-macro
- job-template:
name: 'yardstick-verify'
@@ -211,7 +160,7 @@
deactivate
- job-template:
- name: 'yardstick-{pod}'
+ name: 'yardstick-{installer}-{stream}'
project-type: freestyle
@@ -247,6 +196,10 @@
- 'yardstick-fetch-os-creds'
- 'yardstick-ping'
+ publishers:
+ - email:
+ recipients: ana.cunha@ericsson.com
+
########################
# builder macros
########################
@@ -271,11 +224,9 @@
# if not, create the image
echo "Yardstick: configure the image"
IMAGE_NAME=cirros-0.3.3
- if [[ ! $(nova image-show $IMAGE_NAME > /dev/null 2>&1) ]]; then
+ if ! nova image-show $IMAGE_NAME > /dev/null 2>&1; then
echo "Image $IMAGE_NAME doesn't exist. Creating image $IMAGE_NAME"
glance image-create --name cirros-0.3.3 --is-public true --disk-format qcow2 --container-format bare --file $HOME/yardstick/cirros-0.3.3-x86_64-disk.img
- else
- echo "Image $IMAGE_NAME exists. Proceeding with yardstick."
fi
# set virtualenv