diff options
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 9 | ||||
| -rw-r--r-- | functest/api/resources/v1/tasks.py | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index c70b3628..8b0a2f60 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -7,7 +7,7 @@ COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ 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 && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 4b447a22..2c756028 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -9,11 +9,12 @@ ARG VIMS_TAG=stable COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ 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 \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index d4f18c47..36e80d7e 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -3,10 +3,13 @@ FROM opnfv/functest-core ARG VIMS_TAG=stable RUN apk --no-cache add --update \ - ruby ruby-dev ruby-bundler ruby-irb ruby-rdoc dnsmasq \ - procps git g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ + procps libxslt libxml2 zlib libffi && \ + apk --no-cache add --virtual .build-deps --update \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \ rm -r /src/vims-test/.git && \ - cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system + cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system && \ + 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"] diff --git a/functest/api/resources/v1/tasks.py b/functest/api/resources/v1/tasks.py index f099918f..49214124 100644 --- a/functest/api/resources/v1/tasks.py +++ b/functest/api/resources/v1/tasks.py @@ -80,11 +80,15 @@ class V1TaskLog(ApiResource): return api_utils.result_handler(status=1, data='No such task id') task_log_dir = CONST.__getattribute__('dir_results') + # pylint: disable=maybe-no-member + index = int(self._get_args().get('index', 0)) try: with open(os.path.join(task_log_dir, '{}.log'.format(task_id)), 'r') as log_file: + log_file.seek(index) data = log_file.readlines() + index = log_file.tell() except OSError as err: if err.errno == errno.ENOENT: return api_utils.result_handler( @@ -93,7 +97,7 @@ class V1TaskLog(ApiResource): return api_utils.result_handler( status=1, data='Error with log file') - return_data = {'data': data} + return_data = {'data': data, 'index': index} switcher = {'IN PROGRESS': 0, 'FAIL': 1, 'FINISHED': 2} |