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/components | |
| 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/components')
| -rw-r--r-- | docker/components/Dockerfile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index e692e1f1..781022ef 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,9 +1,9 @@ FROM opnfv/functest-core -# useless build arg forced by releng/jjb/releng/opnfv-docker.sh ARG BRANCH=master ARG OPENSTACK_TAG=stable/pike ARG RALLY_TAG=stable/0.10 +ARG OS_FAULTS_TAG=0.1.16 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ @@ -11,15 +11,20 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - /src/rally && \ + 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 \ - tempest && \ - rm -r upper-constraints.txt /src/rally && \ + /src/rally && \ + rm -r upper-constraints.txt /src/os-faults /src/rally && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ |