aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-15 10:29:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-15 10:29:30 +0000
commit8526ec5005554dbb092f085341ebd84a5c076748 (patch)
treeed0c5028f05365b82bb6ca6bb0fc30a2a180d3a8
parent246b11bd307da2a3a3de9d642a9627aca80e5c4c (diff)
parent6a865b115f7533d70ca622172665c0da6ddac89d (diff)
Merge "Added more consistency when getting the config_functest.yaml"
-rwxr-xr-xdocker/common.sh6
-rwxr-xr-xdocker/prepare_env.sh10
-rw-r--r--testcases/config_functest.yaml2
3 files changed, 6 insertions, 12 deletions
diff --git a/docker/common.sh b/docker/common.sh
index f21263c7e..f03572d76 100755
--- 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 ec14391c0..48320d4cc 100755
--- 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 14724c6cf..814a424e0 100644
--- 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