summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-03 12:35:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-03 12:35:06 +0000
commit256c2293f3e24bdba841b07572c85734847c73b7 (patch)
tree9cf00b62faa31e25604ee27eeb67ca53a6e89115
parentf6f929ae158be1b52cd0ffc0c1f02eb7709504f1 (diff)
parent6c52d16a4e40d6517a454511117ac49e1e34bb09 (diff)
Merge "Freeze the rally version"
-rw-r--r--docker/Dockerfile20
1 files changed, 2 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index dda4ea6e6..1cc2209e5 100644
--- 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,6 +13,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
+ARG RALLY_TAG=0.8.1
ARG TEMPEST_TAG=14.0.0
ARG ODL_TAG=release/beryllium-sr4
ARG OPENSTACK_TAG=stable/mitaka
@@ -107,7 +91,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