From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Mon, 26 Jun 2017 09:14:31 +0000 (+0000)
Subject: Merge "Install opera via python package"
X-Git-Tag: opnfv-5.0.RC1~314
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=063c8af074a70b0b99c5c90c56d1fef541354192;p=functest.git

Merge "Install opera via python package"
---

063c8af074a70b0b99c5c90c56d1fef541354192
diff --cc docker/Dockerfile
index 6aff287a1,ba9a27a1f..029ab0776
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -97,10 -97,8 +97,9 @@@ RUN git clone --depth 1 -b $BRANCH http
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds ${REPOS_DIR}/fds
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
  RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
- RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
  
  # other repositories
 +RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
  RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test
  RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test
  RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter
diff --cc docker/Dockerfile.aarch64
index c7bf4aba8,2b85928c8..084f93506
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@@ -90,10 -90,8 +90,9 @@@ RUN git clone --depth 1 -b $BRANCH http
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
  RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
- RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
  
  # other repositories
 +RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
  RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test
  RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test
  RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos