diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-13 21:18:29 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-13 23:59:12 +0100 |
| commit | 0c7017df0852d0dc5e1bd0161cd7c930e87ba8e1 (patch) | |
| tree | ab28beb4a4f1af613be2682e95b4267e60a87ad8 /docker/restapi/Dockerfile | |
| parent | c7290395d161c8c5fb4a4bf13d543e2a562b3ba1 (diff) | |
Move rally and tempest in functest-restapi
It completes the first patch which partially moved rally and tempest
out of functest-core [1] by updating functest-restapi as well.
os-faults is also installed in the right containers.
[1] https://gerrit.opnfv.org/gerrit/#/c/47115/
Change-Id: Ia460dbe7785e2beffa5ba1a15f5a5bf2083b252a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/restapi/Dockerfile')
| -rw-r--r-- | docker/restapi/Dockerfile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index f2810e19..f3610012 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -3,8 +3,10 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/pike ARG ODL_TAG=master -ARG FDS_TAG=master +ARG RALLY_TAG=stable/0.10 +ARG OS_FAULTS_TAG=0.1.16 ARG REFSTACK_TAG=master +ARG FDS_TAG=master ARG VIMS_TAG=stable COPY thirdparty-requirements.txt thirdparty-requirements.txt @@ -18,12 +20,22 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ + git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \ + update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ + git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ + update-requirements -s --source /src/openstack-requirements /src/rally/ && \ git clone https://github.com/openstack/refstack-client.git /src/refstack-client && \ (cd src/refstack-client && git checkout $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - -e/src/refstack-client -rthirdparty-requirements.txt && \ + tempest /src/os-faults && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + -e/src/refstack-client /src/rally -rthirdparty-requirements.txt && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ doctor-tests && \ @@ -38,7 +50,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ npm -g install npm@latest && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \ - /src/fds/.git /src/vims-test/.git && \ + /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git && \ apk del .build-deps EXPOSE 5000 CMD ["functest_restapi"] |