From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Wed, 5 Jul 2017 15:01:40 +0000 (+0000)
Subject: Merge "Clone tempest before installing the package"
X-Git-Tag: 0.2~506
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b68c9980659ed2698dcd5f562efa59e715a62db;p=functest-xtesting.git

Merge "Clone tempest before installing the package"
---

0b68c9980659ed2698dcd5f562efa59e715a62db
diff --cc docker/Dockerfile
index b4bff0e1,abd9e7cf..781589ad
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -25,9 -25,9 +25,8 @@@ ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_D
  ARG FUNCTEST_DATA_DIR=${FUNCTEST_BASE_DIR}/data
  ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
  ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
 -ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
 -ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests
 +ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
  ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
- ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
  
  # Environment variables
  ENV HOME /home/opnfv
diff --cc docker/Dockerfile.aarch64
index 6f17d1a6,72f99494..1ae52cd3
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@@ -24,9 -24,9 +24,8 @@@ ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_D
  ARG FUNCTEST_DATA_DIR=${FUNCTEST_BASE_DIR}/data
  ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
  ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
 -ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
 -ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests
 +ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
  ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
- ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
  
  # Environment variables
  ENV HOME /home/opnfv