diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-17 09:53:13 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-17 14:23:11 +0200 |
| commit | 13b0e1cbcd873664e3d93dab42d3bff6caaf3e76 (patch) | |
| tree | c79fbd2d129d0d8814ec328d45f60b018a257cf8 /docker/features | |
| parent | 2845d29b185043da58c434c218e5b409b5d23ac4 (diff) | |
Leverage on new opnfv/functest-tempest
It simplifies components, features and smoke containers and they can
now leverage on tempest.
Change-Id: Ie5564b8ba8a58670827af74371194d2583801f1b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index e91155a38..bced40549 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,10 +1,8 @@ -FROM opnfv/functest-core +FROM opnfv/functest-tempest ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG FDS_TAG=master -ARG RALLY_TAG=0.11.2 -ARG OS_FAULTS_TAG=0.1.17 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -14,28 +12,11 @@ RUN apk --no-cache add --update 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/ && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - tempest rally-openstack /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/rally -rthirdparty-requirements.txt && \ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \ 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 && \ - rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git \ - /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 db create && \ + rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |