summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
AgeCommit message (Collapse)AuthorFilesLines
2018-09-10Revert "Bugfix: ansible version should be the same both in Dockerfile and ↵Rex Lee1-1/+1
requirements.txt" This reverts commit 662de49b9f6c116d15882aed9e678cd3cf67494b. JIRA: YARDSTICK-1411 Change-Id: Id277aa8711c9ff77e085d26c90546eecc3490535 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-08-29Bugfix: ansible version should be the same both in Dockerfile and ↵rexlee87761-1/+1
requirements.txt Because Dockerfile is using ansible script to install yardstick requirements. Or it may lead to exception when installing Yardstick. Change-Id: Ia83cf76675a7f3f1d0aa5c311e7b72be5c7ca5c3 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-08-24Bugfix: openstack router list broken in Yardstick container - dovetailrexlee87761-1/+1
Dependancy of python-openstackclient is not constrained. This patch specify openstacksdk and openstackclient's version according to [1]. This patch apply for bugfix and need to backported to fraser stable branch. Continual work need to be done in Gambia according to YARDSTICK-1398. [1] https://github.com/openstack/requirements/blob/stable/pike/upper-constraints.txt JIRA: DOVETAIL-728 Change-Id: I57c718e192699ac322150458d18508b06c93d22b Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-07-10Make uwsgi app to not demonizeMytnyk, Volodymyr1-0/+2
Supervisord doesn't support demonize applications, thus we have to make the uwsgi application to run not in background. - Fixed Yardstick API path. - Fixed HttpClient class to raise correct exception when the HTML response (not JSON) like 4xx, 5xx is received. (http://docs.python-requests.org/en/master/user/quickstart/#json-response-content) JIRA: YARDSTICK-1297 Change-Id: I4d1c1bb7266eeed0bd357bd28b91206d1580611f Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
2018-07-04Bump requirements to match OpenStack Queens release upper requirementsrexlee87761-1/+1
tox -e os-requiremnts results: Validating requirements file "requirements.txt" Package "oslo.config" version 4.11.1 outdated, minimum version 5.1.0 Package "keystoneauth1" version 3.1.0 outdated, minimum version 3.3.0 Package "python-cinderclient" version 3.1.0 outdated, minimum version 3.3.0 Package "requests" version 2.11.1 outdated, minimum version 2.14.2 Package "osc-lib" version 1.7.0 outdated, minimum version 1.8.0 Package "oslo.utils" version 3.28.0 outdated, minimum version 3.33.0 Package "oslo.privsep" version 1.22.1 outdated, minimum version 1.23.0 Incompatible requirement found! JIRA: YARDSTICK-1283 Change-Id: I362c1e2b5c61abf09810ce2a2fe6bab39097d017 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-07-03Merge changes from topics 'YARDSTICK-1250', 'YARDSTICK-1249'Rodolfo Alonso Hernandez1-1/+1
* changes: Fix pip install issues in install.yaml script Bump ansible version to 2.5.5
2018-06-30Bugfix: docker build failedrexlee87761-1/+1
Due to no inventory.ini specified in Dockerfile, which resulsts in ansible-playbook run fail JIRA: YARDSTICK-1277 Change-Id: Iaf689b71b8c86b54b2451d8a8c480f7d94d53561 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-06-21Bump ansible version to 2.5.5Rodolfo Alonso Hernandez1-1/+1
Increase ansible version to 2.5.5. There is a closed bug present in version 2.4.2 which affects to some ansible scripts. When calling recursively different roles, the maximum recursion depth can be exceeded [1]. This bug is fixed in proposed version. [1] https://github.com/ansible/ansible/issues/23609 JIRA: YARDSTICK-1249 Change-Id: Ia45b6a2ab44203e39c52357eb3cfee1e0c77eed3 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
2018-05-24Dockerfile: add ping for prepare_env.shRoss Brattain1-1/+1
INFO: Creating openstack credentials .. Verifying connectivity to 10.20.0.2... /home/opnfv/repos/yardstick//tests/ci/prepare_env.sh: line 56: ping: command not found /home/opnfv/repos/yardstick//tests/ci/prepare_env.sh: line 56: ping: command not found https://build.opnfv.org/ci/view/yardstick/job/yardstick-fuel-baremetal-daily-master/2400/console JIRA: YARDSTICK-1201 Change-Id: Ib9e139046724ece4be7a85cc1ae74cbb0ec8e203 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-05-09Bug Fix: correct the file path to build docker fileting wu1-1/+1
To be able to build a docker file, the path to file "exec_tests.sh" should be modifed from .docker/exec_tests.sh to ./exec_tests.sh. JIRA: YARDSTICK-1157 Change-Id: I0f707ba579039d0efc8f2185b596e23b901c09df Signed-off-by: ting wu <ting.wu@enea.com>
2018-05-03Fix ansible scripts for running in containerJohn O Loughlin1-4/+7
JIRA: YARDSTICK-1147 Change-Id: I52dae85a2d97192bc8a48c5aeea3173b3d4de003 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-05-02Correctly set PYTHONPATH in DockerfileJohn O Loughlin1-2/+2
JIRA: YARDSTICK-1144 Change-Id: I8c0fe229ed620417a85356e017b171260373c43f Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-04-26Migrate install.sh script to ansibleJohn O Loughlin1-8/+11
Ansible scripts to install yardstick. These scripts will take a few options: INSTALLATION_MODE : Container or Baremetal YARDSTICK_DIR: Location of Yardstick directory VIRTUAL_ENVIRONMENT: Should a virtual environment be used NSB_DIR: Location of NSB directory JIRA: YARDSTICK-1126 Change-Id: I4a13e07e96650ffd971dfb18472f2563cfd51aa9 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-03-21Install RabitMQ for RPC messaging between processesRodolfo Alonso Hernandez1-1/+2
In NetworkServices Tescases, the TGs (traffic generators) run the traffic in a separate process. In order to synchronize the traffic injection and the runner interval loops, an RPC server is needed to publish/subscribe events. RabbitMQ is a well supported MQ in Linux (used in OpenStack or collectd) and supported by Python implemented projects like oslo.messaging [1]. RabbitMQ default configuration: - Port: 5672 - User/password: yardstick/yardstick [1]https://github.com/openstack/oslo.messaging JIRA: YARDSTICK-1068 Change-Id: I15db294ee430fb38e574a59b9ce1bf0f8b651a67 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
2018-03-01remove releng from Dockerfile and elsewhereRoss Brattain1-2/+0
Current CI does openrc fetching before starting the Docker container and then passes openrc via Docker mount JIRA: YARDSTICK-691 Change-Id: Id0649130f48db5a5586149b237c5252b953e57be Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-26Bugfix: ci error due to no heat clientrexlee87761-1/+1
JIRA: YARDSTICK-1030 Change-Id: I5d9e135449b2d35f051ecf5fa63a1ce11030de4a Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-01-26Add python-openstackclient in docker imageAlex Yang1-1/+1
"openstack: command not found" error occurred in [1]. The version of python-openstackclient is listed in [2]. This program should be installed in the container image to make CI work for now. [1]: https://build.opnfv.org/ci/job/yardstick-daisy-baremetal-daily-master/114/ [2]: https://github.com/openstack/requirements/blob/stable/pike/global-requirements.txt Change-Id: Idb50e26bb2ca36f2dd6b6dddf94680d479cb9c9f Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-11pyOpenSSL missing: cause 'git review' failedJingLu51-1/+1
JIRA: YARDSTICK-905 In the latest Yardstick container, when use git review to upload patches, an Attribute Error will cause failure. root@a80081a4dccd:/home/opnfv/repos/yardstick# git review Traceback (most recent call last): File "/usr/bin/git-review", line 6, in <module> from git_review.cmd import main File "/usr/lib/python2.7/dist-packages/git_review/cmd.py", line 32, in <module> import requests File "/usr/local/lib/python2.7/dist-packages/requests/_init_.py", line 52, in <module> from .packages.urllib3.contrib import pyopenssl File "/usr/local/lib/python2.7/dist-packages/requests/packages/urllib3/contrib/pyopenssl.py", line 46, in <module> import OpenSSL.SSL File "/usr/lib/python2.7/dist-packages/OpenSSL/_init_.py", line 8, in <module> from OpenSSL import rand, crypto, SSL File "/usr/lib/python2.7/dist-packages/OpenSSL/SSL.py", line 118, in <module> SSL_ST_INIT = _lib.SSL_ST_INIT AttributeError: 'module' object has no attribute 'SSL_ST_INIT' pyOpenSSL is required. Change-Id: I88a4916c9c2dfcdee45320f6b1a37eaae0803671 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-11-20fix docker client don't have trex_clientAce Lee1-0/+3
JIRA: YARDSTICK-854 Add trex_client in docker, so we could run NSB testcase in docker container. Change-Id: Iac1393d6e3a175137973190936ab69a1f2ce8272 Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-11-20Merge "update docker version to 16.04"Ross Brattain1-6/+6
2017-11-17update docker version to 16.04Ace Lee1-6/+6
JIRA: YARDSTICK-690 This patch is for Yardstick Docker base image upgrade to 16.04 This patch will enable ansible build image in yardstick env prepare. Add qemu-img convert to ansible build image. Change-Id: I43127b6020bd20bd9f4aac4fca0df75353b24346 Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-09-04Dockerfile: apt-get clean to save layer spaceRoss Brattain1-1/+1
it seems like normally Dockerfiles do an apt-get clean to remove apt cache and save space on docker layers Change-Id: I2ac9d30daa917973c3ba76a50cda67d6ecb8c47a Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-27Yardstick GUI & GUI deploymentchenjiankun1-0/+1
JIRA: YARDSTICK-758 As E release plan, we have the need of yardstick GUI. This patch is GUI front end code and deployment. The backend code is yardstick API. Change-Id: Ib15f78bcc50168c7828beff97256e9939c6da809 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-07Yardstick install storperf updateJingLu51-0/+2
JIRA: YARDSTICK-702 Sicnce StorPerf has switched to use docker-compose to start container suite. The way Yardstick install storperf should also be updated. Change-Id: Idee05703b8ae5cd03bc214f598f56c8ac05ca755 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-04-20Yardstick 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>
2017-04-05Bugfix: 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>
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-24Update cirros image to latest versionMichael Polenchuk1-1/+1
Change-Id: Iffa1e4529e5b6e9664ac503a5815ea9a034d7515 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.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.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>