Stop redefining $HOME

Then .rally is located in the real home directory.

Change-Id: I3e261d34a41a4105aef8fc0a996df501d638c030
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4465e91..7db184f 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,13 +28,10 @@ ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
 ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
 
 # Environment variables
-ENV HOME /home/opnfv
 ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_DIR}/ci/config_functest.yaml
-ENV REPOS_DIR ${HOME}/repos
+ENV REPOS_DIR ${REPOS_DIR}
 ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds
 
-WORKDIR ${HOME}
-
 # Packaged dependencies
 RUN apt-get update && apt-get install -y \
 build-essential \
@@ -130,4 +127,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_DIR}/cli/functest-complete.sh" >> ${HOME}/.bashrc
+RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 496d351..1339e5e 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -27,13 +27,10 @@ ARG FUNCTEST_DIR=/usr/local/lib/python2.7/dist-packages/functest/
 ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
 
 # Environment variables
-ENV HOME /home/opnfv
 ENV CONFIG_FUNCTEST_YAML ${FUNCTEST_DIR}/functest/ci/config_functest.yaml
-ENV REPOS_DIR ${HOME}/repos
+ENV REPOS_DIR ${REPOS_DIR}
 ENV creds ${FUNCTEST_CONF_DIR}/openstack.creds
 
-WORKDIR ${HOME}
-
 # Packaged dependencies
 RUN apt-get update && apt-get install -y \
 build-essential \
@@ -128,4 +125,4 @@ RUN sh -c 'wget -qO- https://nodejs.org/dist/v4.7.2/node-v4.7.2-linux-arm64.tar.
     && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \
     && cd ${REPOS_DIR}/promise/source && npm install
 
-RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> ${HOME}/.bashrc
+RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 77a52c6..4833c5c 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -21,7 +21,7 @@ general:
         functest_data:      /home/opnfv/functest/data
         ims_data:           /home/opnfv/functest/data/ims/
         functest_images:    /home/opnfv/functest/images
-        rally_inst:         /home/opnfv/.rally
+        rally_inst:         /root/.rally
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds