Change functest branch to stable/brahmaputra

JIRA: FUNCTEST-123

Although this is master, the idea is to run the tests using
brahmaputra branch. After brahmaputra, we will change this back
to master.

Change-Id: Ib67f090724ce733b05c37a69a746b879b1143776
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit 48af5a794b5bbe9d6cb84f02c1e314dd83adf912)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b89264..4a2d87b 100644 (file)
--- 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
@@ -74,4 +74,4 @@ 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'
\ No newline at end of file
+RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3'

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index cf40749..ec14391 100755 (executable)
--- 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

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index bca4f9d..5c45761 100644 (file)
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -27,7 +27,7 @@ general:
 
     repositories:
         # branch and commit ID to which the repos will be reset (HEAD)
-        functest_branch:    master
+        functest_branch:    stable/brahmaputra
         functest_commit:    latest
         releng_branch:  master
         releng_commit:  latest