Added more consistency when getting the config_functest.yaml

Change-Id: Ie48e16adee25f7a00d6b9d4a45e804a066064eee
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit 6a865b115f7533d70ca622172665c0da6ddac89d)

diff --git a/docker/common.sh b/docker/common.sh
index f21263c..f03572d 100755 (executable)
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -20,6 +20,12 @@
 #
 # If it is not provided, take the existing one in the functest repo
 #
+
+# this pull is to be removed right before the B release, once we build
+# a release candidate docker
+cd $repos_dir/functest
+git pull
+
 mkdir -p /home/opnfv/functest/conf
 config_file=/home/opnfv/functest/conf/config_functest.yaml
 if [ ! -f ${config_file} ]; then

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index ec14391..48320d4 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -80,16 +80,6 @@ fi
 
 if [ $offline == false ]; then
     # Update repos
-    info "Updating Functest repository...."
-    cd ${FUNCTEST_REPO_DIR}
-    info "Functest repo: pulling to latest..."
-    git pull
-    if [ ${FUNCTEST_COMMIT} != "latest" ]; then
-        info "Functest repo: given commit is ${FUNCTEST_COMMIT}. Reseting..."
-        git reset --hard ${FUNCTEST_COMMIT}
-    fi
-    source ${BASEDIR}/common.sh
-
     info "Updating Releng repository...."
     cd ${RELENG_REPO_DIR}
     if [ ${RELENG_BRANCH} != "master" ]; then

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 14724c6..814a424 100644 (file)
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -28,8 +28,6 @@ general:
 
     repositories:
         # branch and commit ID to which the repos will be reset (HEAD)
-        functest_branch:    stable/brahmaputra
-        functest_commit:    latest
         releng_branch:  master
         releng_commit:  latest
         rally_branch:   master