aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2017-04-01Yardstick virtualenv supportchenjiankun1-46/+9
JIRA: YARDSTICK-620 Currently we recommend using docker to run yardstick. And it is hard to use virtualenv to install yardstick. So I modify install.sh in yardstick root path. It will support using virtualenv to install yardstick(including API) in linux. In this patch, I make yardstick support read yardstick configuration have priority over constants. Change-Id: I9ea1241b228532a6497451e6c8f232173ddb783e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-03-28Set work directory in Yardstick containerJingLu51-0/+3
JIRA: YARDSTICK-608 Set the work directory to /home/opnfv/repos in yardstick docker container to help users better understand file structure. This is a improvement related with document improvement. Change-Id: Ief4b76e6d6898ceab4a546574f5a09d51eb0d945 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-03-27pathspec 'master' did not match any file(s) known to gitchenjiankun1-2/+1
JIRA: YARDSTICK-605 On stable branch, exec_tests.sh will also try to git checkout master branch, which cause error "pathspec 'master' did not match any file(s) known to git." This is a remianing bug from the previous release. see at: https://build.opnfv.org/ci/view/yardstick/job/yardstick-apex-lf-pod1-daily-danube/62/console This error occur in line 48. But the reason is 'set -e' If we set 'set -e': 'git checkout master && git pull' return 1 but it will go on executing; but 'git checkout master' will return 1 and terminate immediately. If we do not set, it will return 1 but will terminate immediately. Actually we not need 'git checkout master' here because it is already in stable/danube branch. So I remove it. Change-Id: I106a1da28cf2deee90ebcb25adaf638a210928ee Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-03-24Update cirros image to latest versionMichael Polenchuk1-1/+1
Change-Id: Iffa1e4529e5b6e9664ac503a5815ea9a034d7515 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-03-21Merge "yardstick offline support"Jing Lu1-2/+2
2017-03-20yardstick offline supportchenjiankun1-2/+2
JIRA: YARDSTICK-597 Currently yardstick can not run offline. The reason is yardstick will pull the latest code when run in CI. Actually we need not pull the latest code because the code in yardstick is already the latest code. So I remove them. Change-Id: Ief87c529625ccaa26e758a2206318b3797bbfd74 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-03-17Dockerfile: Use qemu-user-static from xenial Paul Vaduva1-1/+3
qemu-user-static from Trusty crashes when ssl is used in chroot. JIRA: YARDSTICK-592 Change-Id: I81e8f04d7469082ceb6512cb09e11dfa672e5e98 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2017-02-09Fix: yardstick-docker-build-push-master failureJingLu51-0/+1
JIRA: YARDSTICK-552 Change-Id: I5c006b2fcbffb6a3904c378ab0557b5ce437d9ed Signed-off-by: JingLu5 <lvjing5@huawei.com>
2016-12-05Bugfix: easy_install -U setuptools go wrong due to the setuptools versionchenjiankun1-1/+1
JIRA: YARDSTICK-445 Currently we do not set the setuptools version. Now the setuptools version update to the 30.2.0, but when run easy_install -U setuptools, it goes wrong. So I set the setuptools version to 30.0.0 Change-Id: Id7ae232cce6d088355f71a7124688cb625d18457 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2016-12-03Making nginx and uwsgi service start when run docker by using supervisorchenjiankun1-0/+2
JIRA: YARDSTICK-444 We need web service start when docker run. But now we add command in bashrc, so the web service start only if we login in docker container. So I use supervisor to make the web service start when docker run. Change-Id: Ic77eb0e130ae7dbd82039c312649fed76b128513 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2016-11-30Clone the corresponding branch of the repo according to the job branchjose.lausuch1-2/+2
Make use of the ARG BRANCH given at build time cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$branch ." Change-Id: I44d342bfa5499ebd119e9147695ea82853eb64b6 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2016-11-30BugFix: yardstick-docker-build-push failureJingLu51-0/+2
JIRA: YARDSTICK-434 Change-Id: I391403975bf4643c5658e666a165762d690c42bc Signed-off-by: JingLu5 <lvjing5@huawei.com>
2016-11-23Deployment for APIchenjiankun1-0/+7
JIRA: YARDSTICK-418 Set yardstick.conf in /etc/yardstick/ to config yardstick output way Set nginx config file Set nginx service and uwsgi service start when boot Change-Id: I5749042ae1b05feaf895cb0abffed7f9194b9cee Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2016-11-15Yardstick installation unified (pip/setup)chenjiankun1-1/+1
JIRA: YARDSTICK-394 Change-Id: I486aa24121b2ad8d66cd6df97ca86ef826862c91 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2016-09-29Propose common directory for Docker related filesjose.lausuch3-0/+157
Proposal 3 from this wiki: https://wiki.opnfv.org/display/INF/Docker+handling+in+CI#DockerhandlinginCI-3Dockerfilelocation Do not merge before this: https://gerrit.opnfv.org/gerrit/#/c/22565/ JIRA: RELENG-148 Change-Id: I6fc236688389879fd7f62788eaf77d75dc4730cd Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>