Merge "delete useless file multisite.py"

[functest.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4e74dd3..bb469ae 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,23 +1,6 @@
 ########################################
 #   Docker container for FUNCTEST
 ########################################
-# Purpose: run all the tests against the POD
-#          from a pre-installed docker image
-#
-# Maintained by Jose Lausuch
-# Build:
-#    $ docker build -t opnfv/functest:tag .
-#
-# Execution:
-#    $ docker run -t -i \
-#      -e "INSTALLER_TYPE=fuel|apex|compass|joid \
-#      -e "INSTALLER_IP=10.20.0.2" \
-#      -v $(pwd)/config_functest.yaml:/home/opnfv/repos/functest/functest/ci/config_functest.yaml
-#      opnfv/functest /bin/bash
-#
-# NOTE: providing config_functest.yaml is optional. If not provided, it will
-#       use the default one located in the repo
-#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -30,7 +13,8 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 # Environment variables
 ARG BRANCH=master
-ARG TEMPEST_TAG=12.2.0
+ARG RALLY_TAG=0.8.1
+ARG TEMPEST_TAG=14.0.0
 ARG ODL_TAG=release/beryllium-sr4
 ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
@@ -93,7 +77,6 @@ RUN git config --global http.sslVerify false
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/functest ${REPOS_DIR}/functest
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/moon ${REPOS_DIR}/moon
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
@@ -107,7 +90,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/rele
 # OpenStack repositories
 RUN git clone --depth 1 -b $OPENSTACK_TAG https://github.com/openstack/networking-bgpvpn ${REPOS_DIR}/bgpvpn
 #RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
-RUN git clone https://github.com/openstack/rally.git ${REPOS_DIR}/rally
+RUN git clone --depth 1 -b $RALLY_TAG https://github.com/openstack/rally.git ${REPOS_DIR}/rally
 RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
 
 # other repositories
@@ -152,7 +135,6 @@ RUN cd ${REPOS_DIR}/sdnvpn && pip install .
 
 RUN cd ${REPOS_DIR}/bgpvpn && pip install .
 #RUN cd ${REPOS_DIR}/kingbird && pip install -e .
-RUN cd ${REPOS_DIR}/moon/moonclient/ && python setup.py install
 
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd ${REPOS_VNFS_DIR}/vims-test \