aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile3
-rwxr-xr-xdocker/common.sh1
-rwxr-xr-xdocker/prepare_env.sh4
3 files changed, 2 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a39775c8..4a2d87bf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -57,7 +57,7 @@ RUN mkdir -p /root/.ssh
RUN chmod 700 /root/.ssh
RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
+RUN git clone -b stable/brahmaputra https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally
@@ -75,4 +75,3 @@ ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/op
RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN curl -L https://get.rvm.io | bash -s stable
RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3'
-RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test;rvm use system;bundle install'
diff --git a/docker/common.sh b/docker/common.sh
index eccdc252..f21263c7 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -20,6 +20,7 @@
#
# If it is not provided, take the existing one in the functest repo
#
+mkdir -p /home/opnfv/functest/conf
config_file=/home/opnfv/functest/conf/config_functest.yaml
if [ ! -f ${config_file} ]; then
default_config_file=$(find /home/opnfv/repos -name config_functest.yaml)
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index cf407499..ec14391c 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -82,10 +82,6 @@ if [ $offline == false ]; then
# Update repos
info "Updating Functest repository...."
cd ${FUNCTEST_REPO_DIR}
- if [ ${FUNCTEST_BRANCH} != "master" ]; then
- info "Functest repo: checkout ${FUNCTEST_BRANCH} branch..."
- git checkout ${FUNCTEST_BRANCH}
- fi
info "Functest repo: pulling to latest..."
git pull
if [ ${FUNCTEST_COMMIT} != "latest" ]; then