diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-01-15 11:24:58 +0100 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-15 10:29:42 +0000 |
| commit | c02c9a09ea850103d6f7ebae8b4f182329b89dae (patch) | |
| tree | ed0c5028f05365b82bb6ca6bb0fc30a2a180d3a8 | |
| parent | 3bc8f5030dca26025914fdab8472ef8de741b519 (diff) | |
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)
| -rwxr-xr-x | docker/common.sh | 6 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 10 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 2 |
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 |