From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 13 May 2019 17:55:22 +0000 (+0000)
Subject: Merge "Stop leveraging on neutron-tempest-plugin package" into stable/iruya
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da2ffdefb2e660f77cc20b64d2590e0927230911;p=functest.git

Merge "Stop leveraging on neutron-tempest-plugin package" into stable/iruya
---

da2ffdefb2e660f77cc20b64d2590e0927230911
diff --cc docker/smoke/Dockerfile
index 55df2883d,5488f2252..949a52a8f
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@@ -25,9 -31,11 +31,9 @@@ RUN apk --no-cache add --virtual .build
          git checkout FETCH_HEAD) && \
      update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
      pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-         /src/patrole /src/barbican-tempest-plugin neutron-tempest-plugin \
+         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
          networking-bgpvpn networking-sfc && \
      mkdir -p /home/opnfv/functest/data/refstack && \
 -    wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \
 -        -O /home/opnfv/functest/data/refstack/defcore.txt && \
      mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \
      wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \
      virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
@@@ -36,8 -44,7 +42,8 @@@
      oslopolicy-sample-generator  --format json --output-file /etc/neutron/policy.json --namespace neutron && \
      deactivate && \
      rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \
-         /src/patrole /src/barbican-tempest-plugin && \
+         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
      apk del .build-deps
 +COPY defcore.txt /home/opnfv/functest/data/refstack/defcore.txt
  COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
  CMD ["run_tests", "-t", "all"]