X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick.yml;h=b6a02dca32f4666a0a6164bdc272cd0da329844d;hb=refs%2Fchanges%2F07%2F4407%2F1;hp=b11f006bdf6c0a320481d1cea038b89ebe76a0cb;hpb=21548c212a581a13dc1bd8336892f4ac266d0321;p=releng.git diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index b11f006bd..b6a02dca3 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -1,20 +1,25 @@ - project: name: yardstick - jobs: - - 'yardstick-{pod}' - - 'yardstick-daily-{stream}' - - 'yardstick-merge' - - 'yardstick-verify' + + project: 'yardstick' pod: - - opnfv-jump-1: - node: 'opnfv-jump-1' + - lf: + node: 'opnfv-jump-2' + installer_type: 'fuel' + installer_ip: '10.20.0.2' + - ericsson: + node: 'yardstick-pod' installer_type: 'fuel' installer_ip: '10.20.0.2' - - opnfv-jump-2: - node: 'opnfv-jump-2' - installer_type: 'foreman' - installer_ip: '172.30.10.73' + + installer: + - fuel + + jobs: + - 'yardstick-{installer}-{pod}-{stream}' + - 'yardstick-merge' + - 'yardstick-verify' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -22,75 +27,11 @@ - master: branch: 'master' - 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' - project-type: freestyle - node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - parameters: - project-parameter: project: '{project}' @@ -107,10 +48,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -133,12 +70,15 @@ builders: - shell: | #!/bin/bash + set -o errexit + set -o pipefail echo "Running unit tests..." cd $WORKSPACE virtualenv $WORKSPACE/yardstick_venv source $WORKSPACE/yardstick_venv/bin/activate - python setup.py develop > /dev/null 2>&1 + easy_install -U setuptools + python setup.py develop ./run_tests.sh deactivate @@ -149,16 +89,8 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -175,10 +107,6 @@ refspec: '' choosing-strategy: 'default' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -195,19 +123,20 @@ builders: - shell: | #!/bin/bash + set -o errexit + set -o pipefail echo "Running unit tests..." cd $WORKSPACE virtualenv $WORKSPACE/yardstick_venv source $WORKSPACE/yardstick_venv/bin/activate - python setup.py develop > /dev/null 2>&1 + easy_install -U setuptools + python setup.py develop ./run_tests.sh deactivate - job-template: - name: 'yardstick-{pod}' - - project-type: freestyle + name: 'yardstick-{installer}-{pod}-{stream}' disabled: false @@ -216,6 +145,11 @@ parameters: - project-parameter: project: '{project}' + - '{pod}-parameters' + - string: + name: POD_NAME + default: '{pod}' + description: "POD where the job runs" - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -231,63 +165,48 @@ refspec: '' branch: master - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 + triggers: + - 'yardstick-trigger-{pod}' builders: + - 'yardstick-cleanup' - 'yardstick-fetch-os-creds' - - 'yardstick-ping' + - 'yardstick-daily' + + publishers: + - email: + recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com ######################## # builder macros ######################## - builder: - name: yardstick-ping + name: yardstick-daily builders: - shell: | #!/bin/bash - set -o errexit - set -o pipefail - - echo "Yardstick: prepare Yardstick environment" + set -o errexit - # source openstack vars - if [[ ! -f $HOME/opnfv-openrc.sh ]]; then - echo "Unable to access file $HOME/opnfv-openrc.sh" - exit 1 - fi - source $HOME/opnfv-openrc.sh - - # check if cirros-0.3.3 image is already available - # 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 - 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 + echo "Yardstick: Run benchmark test suites ..." - # set virtualenv - echo "Yardstick: setup virtualenv" - cd $WORKSPACE - virtualenv $WORKSPACE/yardstick_venv - source $WORKSPACE/yardstick_venv/bin/activate - python setup.py develop > /dev/null 2>&1 + # Pull the latest image + docker pull opnfv/yardstick - # set virtualenv - echo "Yardstick: execute ping scenario" - yardstick task start samples/ping.yaml -v -d + # Test suites to run + TEST_SUITES=opnfv_${POD_NAME}_daily.yaml - # cleanup - echo "Yardstick: cleanup" - glance image-delete $IMAGE_NAME + docker run \ + --privileged=true \ + --rm \ + -t \ + -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ + -e "INSTALLER_IP=${INSTALLER_IP}" \ + -e "POD_NAME=${POD_NAME}" \ + -e "EXTERNAL_NETWORK=net04_ext" \ + opnfv/yardstick \ + run_tests.sh \ + $TEST_SUITES - # done echo "Yardstick: done!" - builder: @@ -295,3 +214,61 @@ builders: - shell: !include-raw ../../utils/fetch_os_creds.sh + +- builder: + name: yardstick-cleanup + builders: + - shell: | + #!/bin/bash + + echo "Cleaning up docker containers/images..." + + # Remove previous running containers if exist + if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then + echo "Removing existing opnfv/yardstick containers..." + docker ps | grep opnfv/yardstick | awk '{print $1}' | xargs docker stop + docker ps -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm + fi + + # Remove existing images if exist + if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then + echo "Docker images to remove:" + docker images | head -1 && docker images | grep opnfv/yardstick + image_tags=($(docker images | grep opnfv/yardstick | awk '{print $2}')) + for tag in "${image_tags[@]}"; do + echo "Removing docker image opnfv/yardstick:$tag..." + docker rmi opnfv/yardstick:$tag + done + fi + +######################## +# parameter macros +######################## +- parameter: + name: 'ericsson-parameters' + parameters: + - 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." + +- parameter: + name: 'lf-parameters' + parameters: + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "URL for LF POD" + +######################## +# trigger macros +######################## +- trigger: + name: 'yardstick-trigger-ericsson' + triggers: + - timed: '@midnight' + +- trigger: + name: 'yardstick-trigger-lf' + triggers: + - timed: '#@midnight'