diff options
| -rw-r--r-- | docker/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 13 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 2 |
3 files changed, 11 insertions, 17 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 80db3c9b1..7db184f43 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 \ @@ -81,6 +78,9 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ -r thirdparty-requirements.txt && \ + mkdir -p /etc/rally && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + mkdir -p /var/lib/rally/database && rally-manage db create && \ rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories @@ -97,9 +97,6 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos -RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ - && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh - RUN add_images.sh RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 @@ -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 274db865b..1339e5e96 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 \ @@ -80,6 +77,9 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ -r thirdparty-requirements.txt && \ + mkdir -p /etc/rally && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + mkdir -p /var/lib/rally/database && rally-manage db create && \ rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories @@ -93,9 +93,6 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr 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 -RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \ - && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh - RUN add_images.sh RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 @@ -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 77a52c659..4833c5c8d 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 |