diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-11-13 07:45:34 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-11-13 09:38:22 +0000 |
| commit | b988ac0646bc4d58144c8e86dc178b099a3d3ed3 (patch) | |
| tree | 0d536b35c21da68b748a307865a669e4ef3ba997 /docker/core | |
| parent | 9e72ad1edd88aada55a0328cd72d4941c4e6fc60 (diff) | |
Remove rally and tempest from core/Dockerfile
JIRA: FUNCTEST-889
Change-Id: I6092c8b6599705d23dcb3aba8c4470b76c41455c
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 165c8a7b2..704f5d945 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -2,7 +2,6 @@ FROM alpine:3.6 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 --update \ @@ -11,8 +10,7 @@ RUN apk --no-cache add --update \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ 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/ \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ > upper-constraints.txt && \ git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \ (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \ @@ -21,17 +19,12 @@ RUN apk --no-cache add --update \ -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/os-faults /src/rally && \ + /src/os-faults && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ /src/functest && \ - rm -r upper-constraints.txt /src/functest /src/os-faults/.git /src/rally/.git && \ - 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 && \ + rm -r upper-constraints.txt /src/functest /src/os-faults/.git && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ apk del .build-deps |