summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
AgeCommit message (Collapse)AuthorFilesLines
2017-04-22Yardstick virtualenv supportchenjiankun1-1/+4
JIRA: YARDSTICK-620 In the patch, I separate python-setuptools from install.sh and separate appdirs from requirements.txt because there will be error when install them in virtualenv. Also I will update the documentation when this patch merged; Change-Id: I99a532d1851983775869e7c5e8e65fd0229e86df Signed-off-by: chenjiankun <chenjiankun1@huawei.com> (cherry picked from commit bb365d411d88a71871993b4ed803c2ffbbcb79bf)
2017-04-06Bugfix: fix query job status in TC074JingLu51-1/+1
JIRA: YARDSTICK-621 The storperf job status query in TC074 didn' work properly. The cause is the "type: status" is not passed in the URL. This patch also update storperf VM image to xenial. Change-Id: Idd9f501416b24612f6045a57ba2a95e2ed3a9572 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit b2fb23ca8ccc1acedaa9156552af4ba347f24103)
2017-04-06Yardstick 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> (cherry picked from commit b74d875134b988a26441d559a9e700aaa68d6a0c)
2017-04-01Merge "Set work directory in Yardstick container" into stable/danubeJing Lu1-0/+3
2017-03-30Update cirros image to latest versionMichael Polenchuk1-1/+1
Change-Id: Iffa1e4529e5b6e9664ac503a5815ea9a034d7515 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 043727feabaf7cabb719dbd3d52274bcd0dbea66)
2017-03-29Set 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> (cherry picked from commit 343970dc9c6193e28863e4ab8bae801b5060ae6a)
2017-03-21Dockerfile: 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> (cherry picked from commit 9d9925c30e9c7ad477041c28251b411432457568)
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.lausuch1-0/+66
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>