diff options
author | Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2015-12-07 18:51:22 +0100 |
---|---|---|
committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2015-12-08 15:09:22 +0000 |
commit | 70c27f24d07411103fb63090d17390f5ea249ebc (patch) | |
tree | 8e831abdde3f7d0c3bc67b79e8358d0d120cb71f /ci/docker/yardstick-ci/run_tests.sh | |
parent | 7dcceb89768b2ab2de9d88718978c850afd092dd (diff) |
Docker image cleanup
- Renamed docker image 'opnfv/yardstick-ci' -> 'opnfv/yardstick'
as recommended by project.
- Added cirros image and releng repo to docker image in order to
make it more usable in offline mode.
- Renamed run_benchmarks to run_tests.sh
- Moved some environment setups to a new file prepare_env.sh
- Added daily test suites file for ericsson and LF pods.
Docker image is now built and pushed by releng script:
https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blob;f=jjb/opnfv/opnfv-docker.sh
The ci/docker/Makefile file is not used by releng to build yardstick
image but the makefile can still be used to build and test docker
images locally.
Change-Id: If9d6740b39e91d145c587d8d5e2bd372d09a46a9
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Diffstat (limited to 'ci/docker/yardstick-ci/run_tests.sh')
-rwxr-xr-x | ci/docker/yardstick-ci/run_tests.sh | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/ci/docker/yardstick-ci/run_tests.sh b/ci/docker/yardstick-ci/run_tests.sh new file mode 100755 index 000000000..531feacc2 --- /dev/null +++ b/ci/docker/yardstick-ci/run_tests.sh @@ -0,0 +1,55 @@ +#!/bin/bash +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -e + +: ${YARDSTICK_REPO:='https://gerrit.opnfv.org/gerrit/yardstick'} +: ${YARDSTICK_REPO_DIR:='/home/opnfv/yardstick'} +: ${YARDSTICK_BRANCH:='master'} # branch, tag, sha1 or refspec + +: ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'} +: ${RELENG_REPO_DIR:='/home/opnfv/repos/releng'} +: ${RELENG_BRANCH:='master'} # branch, tag, sha1 or refspec + +git_checkout() +{ + if git cat-file -e $1^{commit} 2>/dev/null; then + # branch, tag or sha1 object + git checkout $1 + else + # refspec / changeset + git fetch --tags --progress $2 $1 + git checkout FETCH_HEAD + fi +} + +echo +echo "INFO: Updating releng -> $RELENG_BRANCH" +if [ ! -d $RELENG_REPO_DIR ]; then + git clone $RELENG_REPO $RELENG_REPO_DIR +fi +cd $RELENG_REPO_DIR +git checkout master && git pull +git_checkout $RELENG_BRANCH $RELENG_REPO + +echo +echo "INFO: Updating yardstick -> $YARDSTICK_BRANCH" +if [ ! -d $YARDSTICK_REPO_DIR ]; then + git clone YARDSTICK_REPO $YARDSTICK_REPO_DIR +fi +cd $YARDSTICK_REPO_DIR +git checkout master && git pull +git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO + +# setup the environment +source $YARDSTICK_REPO_DIR/ci/prepare_env.sh + +# run tests +$YARDSTICK_REPO_DIR/ci/yardstick-verify $@ |