aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2017-07-10Define CMD in smoke and healthcheck containersCédric Ollivier2-0/+2
Change-Id: I083f8e96fc30bc1793f8c43ff2c155f1c889ae19 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-10Download Functest's upper-constraints.txtCédric Ollivier7-71/+28
It also removes all temporarily files [1] and reuses OPENSTACK_TAG and BRANCH args. [1] https://gerrit.opnfv.org/gerrit/37077 Change-Id: Id87ffdf14ccb1a34f117241c882423adf79f44c5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-10Add upper-constraints.txt for FunctestCédric Ollivier9-31/+80
It completes OpenStack's upper-constraints.txt by adding Functest's requirements. This file is temporarily duplicated to allow building the containers. It will be removed via a next patch when this patch is merged. openbaton-cli could be updated (e.g. 3.2.8). Change-Id: I26de2d22f9e8973c5a58c3cc5129142fa628e57a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-10Add lesser containers based on AlpineCédric Ollivier6-0/+213
It splits the full container into: - functest-core - functest-healthcheck - functest-smoke Smoke suite is currently partial and will be completed later (it may require updates in third party projects). Features, components and vnf suites will be integrated in other patchsets. Change-Id: I635a7fd84cac583c28bb1c82bc6cc9107a39f7ea Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-08Stop redefining $HOMECédric Ollivier2-10/+4
Then .rally is located in the real home directory. Change-Id: I3e261d34a41a4105aef8fc0a996df501d638c030 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-08Get rid of install_rally.shCédric Ollivier2-6/+6
It simply creates the required db. Change-Id: I48fb017f3ebfcdbd5de898b185c1933228bfef16 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-07Inherit packages when creating /src/tempest/.venvCédric Ollivier2-8/+2
It simply calls the --system-site-packages option as all requirements are already installed and then saves space. Change-Id: Ibb37e54bcbbb8bd9b84e6d43a694ab685b561db1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-06Stop using tempest version in DockerfileCédric Ollivier2-2/+2
The sed instruction is enhanced to automatically copy the version written in the OpenStack's upper-constraints.txt. Change-Id: Icbfde6fb097b1eaf880184c4f63de11854bfdb47 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-06Remove setup_env for refstack in DockerfileLinda Wang3-11/+13
It creates a symlink for .tempest required by refstack, and then install the requirements of tempest into a virtualenv which should be located in the dir .tempest/.venv. Now refstack_client is located in /src like tempest to avoid a link in /usr/local/lib/python2.7/dist-packages. JIRA: FUNCTEST-846 Change-Id: I99cedd00daaac57f85532ef41b91da20dec3dcb8 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-07-06Move rally and tempest to requirements.txtCédric Ollivier3-4/+4
As rally and tempest are called when preparing env, they are considered as dependencies. It also modifies on-the-fly upper-contraints.txt to allow cloning the git repository. Change-Id: I72e809d4cf15f9f2539a74fce1c6eb444d8c3b47 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-06Add a default value to protect add_images.shCédric Ollivier1-0/+2
It sets a default value to the optional env var: FUNCTEST_IMAGES_DIR Change-Id: Ib78af2aaee27470ad10b0979a68c09963091cbb6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-06Set repo_tempest to /src/tempestCédric Ollivier2-2/+2
It also calls pip install via the right src value to prevent from changing the working dir when building Ubuntu or Alpine containers. Change-Id: I236524ca270f4173e0636bee60a0f136d77ac07a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-05Merge "Clone tempest before installing the package"Jose Lausuch3-14/+17
2017-07-05Clone tempest before installing the packageCédric Ollivier3-14/+17
Rally and refstack require a tempest working dir. It now clones the offical repository before running setup.py develop. 14.0 is selected to conform with OpenStack upper-constraints.txt. Dockerfile downloads the official OpenStack upper-constraints.txt to remove the condition about tempest which forbids cloning it. Change-Id: I8410570d660b07a1ecfc48fab93022f72acdaac7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-05Merge "Update the link to firewall_block_image.img"Serena Feng1-1/+3
2017-07-04Fix environment variables in Dockerfilejose.lausuch2-12/+8
After merging [1], there were some hardcoded values pointint to ~/repos/functest. [1] https://gerrit.opnfv.org/gerrit/#/c/36827/ Change-Id: Icd912ca8ab6226cbdb0cc4f8b6f77572ea43ae06 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-07-04Sync thirdparty-requirements.txtCédric Ollivier1-2/+2
It fixes the condition about the tempest version [1]. [1] https://git.openstack.org/cgit/openstack/requirements/plain/global-requirements.txt?h=stable/ocata Change-Id: Iaa1f58aec1f58b372ff6280b1f1e4a5422986a55 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-04Fix upper-constraints.txt urlCédric Ollivier2-2/+2
Change-Id: I44f7b476d56bcd7cdac4ba0e5c85717bd41f7e45 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-04Update the link to firewall_block_image.imgLinda Wang1-1/+3
As the link http://205.177.226.237:9999/onosfw/firewall_block_image.img has been deprecated, now the valid link is updated, aiming at running the testcase onos_sfc. JIRA: FUNCTEST-820 Change-Id: Id848e3ab92c3b0fb47e3c755d203844dd94d8408 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-07-02Remove the former link /home/opnfv/repos/functestCédric Ollivier1-3/+0
All operations required have been applied [1]. All documentations are updated as well to close the topic. It should be noted that runfunctest.rst must be hugely updated because all $PS1 are wrong. [1] https://gerrit.opnfv.org/gerrit/#/q/project:functest+branch:master+topic:dockerfile JIRA: FUNCTEST-836 Change-Id: I26658be109fd785d068389816be4260cff823705 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-02Apply restrictive file permissionsCédric Ollivier5-32/+0
It conforms with [1] by creating a new venv which checks the unix permissions. As jjobs call Functest console scripts [2], all perms can be 644. Dockerfiles are updated as well. [1] https://security.openstack.org/guidelines/dg_apply-restrictive-file-permissions.html [2] https://gerrit.opnfv.org/gerrit/#/c/36805/ Depends-On: I9209e6efa1b493e24135402a46df72aaa14115d1 Change-Id: I31bc7f12b775928845e23b6b40288b0a50b87219 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-29Remove networking-bgpvpn from Functest requirementsjose.lausuch1-2/+1
SDNVPN team will take care of installing the module themselves See https://gerrit.opnfv.org/gerrit/#/c/36505/ Change-Id: Ida38c8324e155906bcd18b12a418e7a62e55e3f0 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-29Merge "Fix refstack_defcore"Jose Lausuch2-0/+2
2017-06-28Get install_rally.sh from git.openstack.orgCédric Ollivier2-2/+2
Change-Id: I99a87e2399c1be79dabc9109e10665fc9ef8bee2 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-28Switch to official tosca-parser and heat-translatorCédric Ollivier1-2/+2
They replace the python packages located in parser which don't meet OpenStack's upper constraints [1]. It completes [2] which simply keeps the wrong logic of parser/tests/parser_install.sh. [1] https://build.opnfv.org/ci/job/functest-docker-build-push-master/1170/console [2] https://gerrit.opnfv.org/gerrit/#/c/36653/ Change-Id: If108b8d1fad08237b8a57d82bf5601f4d6ecf64e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-28Leverage on parser python packages in DockerfileCédric Ollivier3-4/+2
It also stops calling parser_install.sh. This file is replaced by the 2 new requirements in docker/thirdparty-requirements.txt: - tosca-parser - heat-translator Change-Id: Ic9dcdd81df9800fc8e559a07f9c100a20bea2290 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-28Fix refstack_defcoreLinda Wang2-0/+2
As refstack-client is reinstalled only by the shell setup_env, the path of .venv and .tempest have been changed. Change-Id: Id50d0c6384295c2448705961942104abbd799b9b Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-06-27Merge "Add sfc in thirdparty-requirements.txt"Jose Lausuch3-6/+3
2017-06-27Merge "Add securityscanning in thirdparty-requirements.txt"Jose Lausuch3-2/+1
2017-06-27Merge "Remove obsolete repos in functest/ci/config_functest.yaml"Jose Lausuch1-1/+0
2017-06-27Add sfc in thirdparty-requirements.txtCédric Ollivier3-6/+3
Now it can be installed via python package [1] and then be listed in thirdparty-requirements.txt. [1] https://gerrit.opnfv.org/gerrit/#/c/36445/ Change-Id: Iae7482865917e51a96a180b0a987ab0ff26a0190 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-27Remove Tempest repo and use the one created by Refstackjose.lausuch2-4/+0
Refstack clones the repo in /home/opnfv/.tempest. Rally can use that repo which is checked out to the REFSTACK_TAG=15.0.0 This way, we avoid having twice the same files. Change-Id: I9b05d29b1c9bdf3d10539b771d0d20abb2b7cc37 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-26Add securityscanning in thirdparty-requirements.txtCédric Ollivier3-2/+1
Now it can be installed via python package [1] and then be listed in thirdparty-requirements.txt. [1] https://gerrit.opnfv.org/gerrit/#/c/36437/ Change-Id: Ib9489de1f46993fa9fe35485fa95baf003d44974 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-26Remove obsolete repos in functest/ci/config_functest.yamlCédric Ollivier1-1/+0
It completes "Use directly OpenStack project packages" [1]. kingbird becomes a dependency. [1] https://gerrit.opnfv.org/gerrit/#/c/36125/ Change-Id: I2cb9e3a2146a2b2bbae89dde9917c5ace70048a6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-26Merge "Take OpenStack's constraints into account"Jose Lausuch2-4/+6
2017-06-26Merge "Install opera via python package"Jose Lausuch3-6/+1
2017-06-26Merge "Install OPNFV sdnvpn via python package"Jose Lausuch3-10/+1
2017-06-26Merge "Stop personalizing the common Dockerfile"Jose Lausuch2-18/+2
2017-06-26Take OpenStack's constraints into accountCédric Ollivier2-4/+6
upper-constraints.txt contains a pinned list of the entire set of transitive requirements for OpenStack [1]. We will add OPNFV's constraints as well for OPNFV projects and their requirements when they are ready. [1] https://specs.openstack.org/openstack/openstack-specs/specs/requirements-management.html Change-Id: I2e23584f957e4de191341800d24c8b2776ef9143 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-23Merge "Revert rally version to 0.8.1"Serena Feng2-2/+2
2017-06-22Revert rally version to 0.8.1Linda Wang2-2/+2
1. Now rally version 0.9.1 is installed via "bash install_rally.sh --yes", cause the default RALLY_GIT_BRANCH is master. Then some rally related tests will fail as rally tests have not been updated in functest 2. rally version 0.8.1 can be installed via --branch 0.8.1 Change-Id: I04003134f070a1a35db2c02f2209e77365be592f Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-06-21Clone tempest repository in the Docker imagejose.lausuch3-1/+3
Rally needs to have a copy of the Tempest repository in order to install the verifier. Otherwise, rally will clone it automatically anyway. This also uplifts the tempest version to 15.0.0 which targets Ocata deployments according to [1] [1]: https://releases.openstack.org/ocata/ Change-Id: I30e922a261a4ab1875d48c4754df09426b5f67e4 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-21Install opera via python packageCédric Ollivier3-6/+1
It should be noted that the other OPNFV projects cannot currently be installed via python packages for many reasons (e.g. binaries not included, no setup.py...). Change-Id: Iaf1c960471b2dd8916eb1a49cb46f50b7dfb9b88 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-21Install OPNFV sdnvpn via python packagejose.lausuch3-10/+1
Change-Id: Ibcaef4eb8658bfe7d1900a8cd6a7b48740524526 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-21Stop personalizing the common DockerfileCédric Ollivier2-18/+2
Any personal config can be applied to another Dockerfile which inherits from this one. Change-Id: Ifb77c0d5821c2b40f2f3e1d6adee6f83d0cd0b29 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-20Use directly OpenStack project packagesCédric Ollivier3-42/+22
It stops cloning via git for the next OpenStack projects: - networking-bgpvpn - rally - tempest - kingbird - refstack-client It should be noted that refstack_client's setup_env is not designed to run in Alpine. Change-Id: I00d17912cad39a0c872d317317e98a78ca9ded2c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-20Change barometer module to loadJose Lausuch3-4/+7
As [1] is merged, the way to call the barometer test case is different as it is hosted in Barometer repo instead of Functest. The former files are also simply removed too. baro-tests is no longer a requirement. It is installed as any third party project. [1] https://gerrit.opnfv.org/gerrit/#/c/35927/ Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Iea56b48fa781600eb3a6ac74662ea8a29f556f99 Signed-off-by: Jose Lausuch <jose.lausuch@ericsson.com> Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-07Leverage on pbr (Python Build Reasonableness)Cédric Ollivier2-26/+32
pbr can inject requirements into the install_requires, tests_require and/or dependency_links arguments to setup. They were previously falsy unset. It also supports conditional dependencies which can be added to the requirements (e.g. subprocess32; python_version=='2.7'). Then requirements.py3.txt is removed. It also removes functest/cli/setup.py which seems false and obsolete. Dockerfile is updated as well. One temporarily link is created because of several hardcoded paths in Functest. Change-Id: I14b3b25e07fbac490dd1d5ce943ec02c5b11f242 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-06-06Update setuptools version to 30.0.0Jose Lausuch2-2/+2
Change-Id: I318446a873a7362a1b7e53b00e9e4daf658c3abb Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-02Update setuptools version to 35.0.2Linda Wang2-2/+2
Docker build failed in CI due to the low version of setuptools(3.3) Change-Id: I5e9b15f59e2cc5e78f5ab1b30fd1525b667f09fb Signed-off-by: Linda Wang <wangwulin@huawei.com>