summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorFran�ois-R�gis Menguy <francoisregis.menguy@orange.com>2021-06-04 13:48:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-06-04 13:48:46 +0000
commit6c9ada52712cbfb461f669cbdf29d31f44abb9a8 (patch)
treeb323b44d871b068204df2dd8e751cf98450b5188 /docker
parentd1f41687819af6a6f1254b8f2d3ecdd428a0c2fd (diff)
parent7bee0560bcfdbdd9f92d9bd6d70c7ab1aa6a8325 (diff)
Merge "Increase Xtesting version in requirements and remove behaveframework temporary patch"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4336261..e851c76 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,8 +40,6 @@ RUN apt-get update && apt-get install -y \
&& wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
# Override Xtesting testcases.yaml file by NFVbench default one
&& cp xtesting/testcases.yaml /usr/local/lib/python3.8/dist-packages/xtesting/ci/testcases.yaml \
- # Temporary override waiting for PR approval : https://gerrit.opnfv.org/gerrit/c/functest-xtesting/+/72431
- && cp xtesting/behaveframework.py /usr/local/lib/python3.8/dist-packages/xtesting/core/behaveframework.py \
&& python3 ./docker/cleanup_generators.py \
&& rm -rf /opt/nfvbench/.git \
# Symlink for retrocompatibility 4.x