diff options
Diffstat (limited to 'docker/benchmarking')
-rw-r--r-- | docker/benchmarking/Dockerfile | 4 | ||||
-rw-r--r-- | docker/benchmarking/hooks/post_checkout | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 36594d7a8..d0957f6b8 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,6 +1,6 @@ FROM opnfv/functest-core -ARG VMTP_TAG=master +ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc ARG NEUTRON_TAG=master RUN apk --no-cache add --update libxml2 libxslt && \ @@ -26,5 +26,5 @@ RUN apk --no-cache add --update libxml2 libxslt && \ cp /src/neutron/rally-jobs/task-neutron.yaml /home/opnfv/functest/data/rally/neutron/rally-jobs/ && \ rm -r /src/vmtp /src/neutron && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/benchmarking/hooks/post_checkout b/docker/benchmarking/hooks/post_checkout index 8d0e98124..c347524ea 100644 --- a/docker/benchmarking/hooks/post_checkout +++ b/docker/benchmarking/hooks/post_checkout @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile |