From cc45ec39b6a6b4b1f50bd18c8a1959dca4d21f5d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 14 Jun 2020 15:11:00 +0200 Subject: Stop leveraging on neutron plugins and extra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Neutron leverages on the upstream Rally task in Stein and newer. Leveraging on the upstream task may fix the side effects which sometimes occured on Vmtp and Shaker [1] and filled better the CNTT model. [1] https://build.opnfv.org/ci/view/functest/job/functest-hunter-daily/574/ Change-Id: I5ee2e3a3ca956cf57365bf4579534177e87dc08b Signed-off-by: Cédric Ollivier --- docker/benchmarking/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/benchmarking/Dockerfile') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 06bd2b62d..3550ae36b 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -23,12 +23,13 @@ RUN apk --no-cache add --update libxml2 libxslt && \ update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/vmtp && \ - mkdir -p /home/opnfv/functest/data/rally/neutron && \ + mkdir -p /home/opnfv/functest/data/rally/neutron/rally-jobs && \ git init /src/neutron && \ (cd /src/neutron && \ git fetch --tags https://opendev.org/openstack/neutron.git $OPENSTACK_TAG && \ git checkout FETCH_HEAD) && \ - cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ + sed "s/NeutronTrunks.create_and_list_trunk_subports/NeutronTrunks.create_and_list_trunks/g" \ + /src/neutron/rally-jobs/task-neutron.yaml > /home/opnfv/functest/data/rally/neutron/rally-jobs/task-neutron.yaml && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vmtp /src/neutron && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml -- cgit 1.2.3-korg