summaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2018-09-10Revert "Bugfix: ansible version should be the same both in Dockerfile and ↵Rex Lee2-2/+2
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 ↵rexlee87762-2/+2
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 - dovetailrexlee87762-2/+2
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-31[workaround] Disable gui for aarch64Cristina Pauna1-8/+18
Currently the aarch64 yardstick image doesn't build because phantomsj and bower don't install properly. Temporarily disable gui for aarch64 only so we can still get the other updates. JIRA: ARMBAND-391 Change-Id: I64f892641c7bdb1cb3a65b210f71b093878b1688 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-07-20Merge "Create Dockerfile to create a yardstick-image of docker"Emma Foley1-0/+39
2018-07-19Create Dockerfile to create a yardstick-image of dockerrexlee87761-0/+39
this Dockerfile target to generate a image with testing tool installed, similar to yardstick-image for VM. The docker image is used by k8s to start pods and test. JIRA: YARDSTICK-1287 Change-Id: Id09a3fb6d880869c8f523d688b2ef641fb434541 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-07-10Make uwsgi app to not demonizeMytnyk, Volodymyr2-4/+5
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 requirementsrexlee87762-2/+2
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 Hernandez2-2/+2
* 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 Hernandez2-2/+2
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 Brattain2-3/+3
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 wu2-13/+12
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-30Update Dockerfile.aarch64.patchCristina Pauna1-18/+12
The patch doesn't apply anymore for the latest docker builds. Updated the patch to accomodate the latest changes to the Dockerfile Change-Id: Ia8a35337a421b3628c90be3060f049c655446758 Signed-off-by: Cristina Pauna <cristina.pauna@enea.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-04-07docker/supervisor.sh: Fix condition block endAlexandru Avadanii1-3/+3
Fixes: 18546b4f Change-Id: I51fcb48e790ff7c57273a3f6712ccb2b9bc4aa32 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-04-06[AArch64] Dockerfile: Fix malformed patchAlexandru Avadanii1-2/+2
Change-Id: Ia2dfc6c4def8e71e36747b8f27cbf22700f676b1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-28Fix RabbitMQ service installation and initializationRodolfo Alonso Hernandez1-0/+3
RabbitMQ service added in [1] is not correctly installed and initialized: - There is an error during the installation process ("\" character missing). - In the installation script, the service needs to be started first. - In the container installation, the service needs to be started via supervisor. [1]https://gerrit.opnfv.org/gerrit/#/c/53597/ JIRA: YARDSTICK-1103 Change-Id: Iade3d6ce4b522e6f576af71b7afe5559081f7929 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
2018-03-21Install RabitMQ for RPC messaging between processesRodolfo Alonso Hernandez2-3/+4
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-12Modify the Docker diff file for ARM64Rodolfo Alonso Hernandez1-1/+1
In I5d9e135449b2d35f051ecf5fa63a1ce11030de4a the Dockerfile was modified. Until we can handle the Dockerfile generation for each architecture in a better way, we need to keep updated the Docker diff file for ARM64. JIRA: YARDSTICK-1030 Change-Id: Ibd9224dcb9a7a897b0da8aab126f62983b5e70bd 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-02-12Fix "./docker/Dockerfile.aarch64.patch"Rodolfo Alonso Hernandez1-1/+1
Patch "./docker/Dockerfile.aarch64.patch" doesn't apply on "./docker/Dockerfile" due to the latest modification done in the original file The original reference lines must be changed. JIRA: YARDSTICK-1007 Change-Id: I5cfc349fbaf34e8da59608e5b803818e2cd9d295 Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.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-12Update Dockerfile.aarch64.patchCristina Pauna1-9/+21
The docker image was not built for aarch64 due to recent changes in the Dockerfile. The updates to the Dockerfile.aarch64.patch are: - update docker version to 16.04 - install dependencies for pyopenssl==17.5.0 (libssl-dev and libffi-dev) JIRA: ARMBAND-353 Change-Id: I915172d4e7ce21b1f5de044b20301b076cb6fe20 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
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-17Merge "Dockerfile: apt-get clean to save layer space"Ross Brattain1-1/+1
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-28exec_tests: remove releng clone codeRoss Brattain1-18/+1
we bind-mount the credentials into the container so we don't need to clone releng Change-Id: I838745a1470015a693f1801c93b930e8df06ef4b Signed-off-by: Ross Brattain <ross.b.brattain@intel.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-08-28Kubernetes context adoption when run in CIchenjiankun1-2/+4
JIRA: YARDSTICK-801 We need kubernetes test case run in CI. We have one scenario k8-nosdb-lb-noha for kubernetes. But for now, we need to do some adoption in CI script. Also I move check OS_AUTH_URL in heat.py. Change-Id: Iff86caf77fd74e70469ad2dc43f2238097ce0001 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-24Add function to upload image from local/url in GUIchenjiankun1-0/+1
JIRA: YARDSTICK-782 As user, we need to upload image from local/url. If upload image from local, user need to choose local image, then we will load it to openstack. If upload image from url, we will download it and load it to openstack. Change-Id: Ia9a42fda15a1dfc91476643635343a2f77a94a6b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-14Add yardstick report for each taskchenjiankun1-0/+4
JIRA: YARDSTICK-784 Currently we have yardstick report in GUI. But if users do not use GUI, they can't see this report. So we need generate a report each task. After run each test case, we can see report: http://ip:port/report/report.html Change-Id: Ic76cf57f55aa6680b91272e210135136f0225373 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-27Yardstick GUI & GUI deploymentchenjiankun4-0/+104
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-07-03Yardstick: Aarch64 jenkins slave supportAlexandru Nemes1-0/+42
Change-Id: I2d58c38d75fc1fe036769340e9fb02932f543510 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
2017-06-22improve git code with devstack functionsRoss Brattain1-19/+67
if we aren't re-cloning we still need to make sure we update the branch/tag/commit to the version from the remote so we need to fetch and then checkout again it is more complicated. Dockerfile does a shallow clone, so we don't get all the remote ref information. To clone a random remote commit id we have to unshallow Change-Id: If15f504b6ff2cfdfc8894fd3b37e687a19616714 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-20temp freeze releng version for stable/danube workaroundRoss Brattain1-1/+2
releng doesn't have a branch, so we need to freeze the releng version. There is an issue with releng fetch_os_creds.sh change /home/opnfv/repos/releng/utils/fetch_os_creds.sh: line 75: BRANCH: unbound variable So we need to revert back to commit before this change Change-Id: Ie8b0f68879a873aab584aa32b576d8b5ba602a13 Signed-off-by: Ross Brattain <ross.b.brattain@intel.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-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>