aboutsummaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-07-04 16:28:13 +0200
committerjose.lausuch <jose.lausuch@ericsson.com>2017-07-04 16:48:06 +0200
commite32f797894cbc66a73976e50bcdb8e59f02eedc2 (patch)
tree1b8feab37aa8257d3b8561c38282874f40c9fd3d /docker/Dockerfile
parent7d4d0a563a920320998a1cb975ddfbaaaec14053 (diff)
Fix environment variables in Dockerfile
After merging [1], there were some hardcoded values pointint to ~/repos/functest. [1] https://gerrit.opnfv.org/gerrit/#/c/36827/ Change-Id: Icd912ca8ab6226cbdb0cc4f8b6f77572ea43ae06 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile10
1 files changed, 4 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 08c205da..b4bff0e1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,14 +25,13 @@ ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf
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
-ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_REPO_DIR}/functest/ci/config_functest.yaml
+ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_DIR}/ci/config_functest.yaml
ENV REPOS_DIR ${HOME}/repos
ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds
@@ -65,8 +64,7 @@ wget \
RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
-RUN mkdir -p ${FUNCTEST_REPO_DIR} \
- && mkdir -p ${REPOS_VNFS_DIR} \
+RUN mkdir -p ${REPOS_VNFS_DIR} \
&& mkdir -p ${FUNCTEST_BASE_DIR}/results \
&& mkdir -p ${FUNCTEST_CONF_DIR} \
&& mkdir -p ${FUNCTEST_DATA_DIR} \
@@ -132,4 +130,4 @@ RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \
&& cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \
&& cd ${REPOS_DIR}/promise/source && npm install
-RUN echo ". ${FUNCTEST_REPO_DIR}/functest/cli/functest-complete.sh" >> ${HOME}/.bashrc
+RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> ${HOME}/.bashrc