diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-11-13 13:11:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-13 13:11:10 +0000 |
| commit | c7290395d161c8c5fb4a4bf13d543e2a562b3ba1 (patch) | |
| tree | 592abd5b4dd11570bbb77e198cb3f1e2a41fa3c4 /docker/smoke | |
| parent | 98311932d448f21a872ac0cd5f46258ecddd89e0 (diff) | |
| parent | b988ac0646bc4d58144c8e86dc178b099a3d3ed3 (diff) | |
Merge "Remove rally and tempest from core/Dockerfile"
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index db02104f..4274c267 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -3,25 +3,37 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/pike ARG ODL_TAG=master +ARG RALLY_TAG=stable/0.10 ARG REFSTACK_TAG=master RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev git && \ + openssl-dev libjpeg-turbo-dev && \ 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 && \ 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/ && \ + 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 \ -e/src/refstack-client && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + /src/rally && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + tempest && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd src/odl_test && git checkout $ODL_TAG) && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git && \ + rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /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 && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"] |