diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel.yml | 7 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 6 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 72 |
4 files changed, 33 insertions, 56 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 96d6af0a6..7a79a374d 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -251,8 +251,8 @@ echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm" - echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.rpm" - echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.rpm | cut -d' ' -f1)" + echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm" + echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties echo diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index 503aa1b82..97bac401b 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -329,6 +329,13 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-fuel-{stream}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' triggers: - 'fuel-{stream}-daily-trigger' diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 78988a76f..07ce11414 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -132,6 +132,9 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' builders: - shell: | @@ -189,6 +192,9 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' builders: - shell: | diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index a9619032f..50369ce73 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -198,7 +198,7 @@ publishers: - email: - recipients: ana.cunha@ericsson.com + recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com ######################## # builder macros @@ -208,64 +208,28 @@ builders: - shell: | #!/bin/bash - set -o errexit - set -o pipefail + set -o errexit - echo "Yardstick: prepare Yardstick environment" + echo "Yardstick: Run benchmark test suites ..." - # 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 + # Remove old containers + docker ps | grep opnfv/yardstick-ci |\ + awk '{print $1}' | xargs -r docker stop &>/dev/null + docker ps -a | grep opnfv/yardstick-ci |\ + awk '{print $1}' | xargs -r docker rm &>/dev/null - # Emergency fix for glance '--is-public' error. - # TODO: This should maybe go into openrc instead!? - export OS_IMAGE_API_VERSION=1 + # Make sure we have latest image + docker pull opnfv/yardstick-ci - # Install required packages. - # 'libguestfs-tools' is needed when building the yardstick image. - sudo yum -y install libguestfs-tools + docker run \ + --privileged=true \ + --rm \ + -t \ + -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ + -e "INSTALLER_IP=${INSTALLER_IP}" \ + opnfv/yardstick-ci \ + run_benchmarks - # set virtualenv - echo "Yardstick: setup virtualenv" - cd $WORKSPACE - virtualenv $WORKSPACE/yardstick_venv - source $WORKSPACE/yardstick_venv/bin/activate - easy_install -U setuptools - python setup.py develop > /dev/null 2>&1 - - echo "Yardstick: configure the images" - # check if cirros-0.3.3 image is already available - # if not, create the image - IMAGE_NAMES[0]=cirros-0.3.3 - if ! nova image-show ${IMAGE_NAMES[0]} > /dev/null 2>&1; then - echo "Image ${IMAGE_NAMES[0]} doesn't exist. Creating image ${IMAGE_NAMES[0]}" - 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 - fi - - # check if yardstick-trusty image is already available - # if not, create the image to $WORKSPACE - IMAGE_NAMES[1]=yardstick-trusty-server - if ! nova image-show ${IMAGE_NAMES[1]} > /dev/null 2>&1; then - echo "Image ${IMAGE_NAMES[1]} doesn't exist. Creating image ${IMAGE_NAMES[1]}" - sudo $(which yardstick-img-modify) $WORKSPACE/tools/ubuntu-server-cloudimg-modify.sh - glance image-create --name yardstick-trusty-server --is-public true --disk-format qcow2 --container-format bare --file $WORKSPACE/yardstick-trusty-server.img - fi - - # execute tasks - echo "Yardstick: execute scenarios" - ./ci/run_tasks.sh - - # cleanup - echo "Yardstick: cleanup" - for IMAGE_NAME in ${IMAGE_NAMES[@]} - do - glance image-delete $IMAGE_NAME - done - - # done echo "Yardstick: done!" - builder: |