From f9be90c62bc013adb8806383158d4866d4efc952 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 8 Jul 2017 12:54:12 +0200 Subject: Stop redefining $HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Then .rally is located in the real home directory. Change-Id: I3e261d34a41a4105aef8fc0a996df501d638c030 Signed-off-by: Cédric Ollivier --- docker/Dockerfile | 7 ++----- docker/Dockerfile.aarch64 | 7 ++----- functest/ci/config_functest.yaml | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4465e918..7db184f4 100644 --- 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 496d351b..1339e5e9 100644 --- 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 77a52c65..4833c5c8 100644 --- 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 -- cgit 1.2.3-korg