summaryrefslogtreecommitdiffstats
path: root/jjb/bottlenecks
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-04-12 23:31:52 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-04-13 02:30:51 -0400
commitcbc32fd99926ea20df148832776ec15a034f7f02 (patch)
tree717608941b48f203ac1a1863bbf94b42c87f849c /jjb/bottlenecks
parent071d40eb575582d65117f84189ddb7ca7c009894 (diff)
Bottlenecks: ci builders for testsuites
JIRA: BOTTLENECK-1 Change-Id: I240c18c008eb7e964cd7d971e4df346d0d35fef5 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'jjb/bottlenecks')
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml112
1 files changed, 76 insertions, 36 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 1c8d048af..09b7df172 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -12,11 +12,18 @@
master: &master
stream: master
branch: '{stream}'
+ #This is used for common project file storage
gs-pathname: ''
+ #This is used for different test suite dependent packages storage
+ gs-packagepath: '/{suite}'
+ #docker tag used for version control
+ docker-tag: 'latest'
brahmaputra: &brahmaputra
stream: brahmaputra
branch: 'stable/{stream}'
- gs-pathname: '{stream}'
+ gs-pathname: '/{stream}'
+ gs-packagepath: '/{stream}/{suite}'
+ docker-tag: 'brahmaputra'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@ -81,8 +88,16 @@
- 'bottlenecks-params-{pod}'
- string:
name: GERRIT_REFSPEC_DEBUG
- default: ''
+ default: 'false'
description: "Gerrit refspec for debug."
+ - string:
+ name: SUITE_NAME
+ default: '{suite}'
+ description: "test suite name."
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: "docker image tag used for version control"
scm:
- git-scm:
@@ -91,11 +106,9 @@
branch: '{branch}'
builders:
- - shell: |
- echo "bottlenecks: this builder should be changed"
- # TO DO, by now the CI job of Bottlenecks has been changed
- #- 'bottlenecks-fetch-os-creds'
- #- 'bottlenecks-run-{suite}'
+ - 'bottlenecks-env-cleanup'
+ - 'bottlenecks-fetch-os-creds'
+ - 'bottlenecks-run-suite'
publishers:
- email:
@@ -104,37 +117,64 @@
########################
# builder macros
########################
-#- builder:
-# name: bottlenecks-fetch-os-creds
-# builders:
-# - shell:
-# !include-raw ../../utils/fetch_os_creds.sh
-
-#- builder:
-# name: bottlenecks-run-rubbos
-# builders:
-# - shell: |
-# #!/bin/bash
-# set -o errexit
-#
-# echo "Bottlenecks: rubbos running now..."
-# cd $WORKSPACE
-# ./ci/run.sh $GERRIT_REFSPEC_DEBUG
-
-#- builder:
-# name: bottlenecks-run-vstf
-# builders:
-# - shell: |
-# #!/bin/bash
-# set -o errexit
-
-# echo "Bottlenecks: vstf running now..."
-# cd $WORKSPACE
-# ./ci/vstf_run.sh $GERRIT_REFSPEC_DEBUG
+- builder:
+ name: bottlenecks-fetch-os-creds
+ builders:
+ - shell:
+ !include-raw ../../utils/fetch_os_creds.sh
-########################
+- builder:
+ name: bottlenecks-env-cleanup
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -e
+ [[ $GERRIT_REFSPEC_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+ echo "Bottlenecks: docker containers/images cleaning up"
+ if [[ ! -z $(docker ps -a | grep opnfv/bottlenecks) ]]; then
+ echo "removing existing opnfv/bottlenecks containers"
+ docker ps -a | grep opnfv/bottlenecks | awk '{print $1}' | xargs docker rm -f >$redirect
+ fi
+
+ if [[ ! -z $(docker images | grep opnfv/bottlenecks) ]]; then
+ echo "Bottlenecks: docker images to remove:"
+ docker images | head -1 && docker images | grep opnfv/bottlenecks
+ image_tags=($(docker images | grep opnfv/bottlenecks | awk '{print $2}'))
+ for tag in "${image_tags[@]}"; do
+ echo "Removing docker image opnfv/bottlenecks:$tag..."
+ docker rmi opnfv/bottlenecks:$tag >$redirect
+ done
+ fi
+
+- builder:
+ name: bottlenecks-run-suite
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -e
+ [[ $GERRIT_REFSPEC_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+ echo "Bottlenecks: ${SUITE_NAME} running now..."
+
+ # pull latest image
+ docker pull opnfv/bottlenecks:$DOCKER_TAG >$redirect
+
+ # run tests by using docker
+ opts="--privileged=true --rm"
+ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+ -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \
+ -e BOTTLENECKS_BRANCH=${BOTTLENECKS_BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \
+ -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL}"
+ run_testsuite="run_tests.sh -s ${SUITE_NAME}"
+ cmd="sudo docker run ${opts} ${envs} opnfv/bottlenecks ${run_testsuite} >${redirect}"
+ echo "Bottlenecks: docker cmd running: ${cmd}"
+ ${cmd}
+
+####################
# parameter macros
-########################
+####################
+
- parameter:
name: 'bottlenecks-params-intel-pod5'
parameters: