diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-15 10:29:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-15 10:29:30 +0000 |
| commit | 8526ec5005554dbb092f085341ebd84a5c076748 (patch) | |
| tree | ed0c5028f05365b82bb6ca6bb0fc30a2a180d3a8 /docker | |
| parent | 246b11bd307da2a3a3de9d642a9627aca80e5c4c (diff) | |
| parent | 6a865b115f7533d70ca622172665c0da6ddac89d (diff) | |
Merge "Added more consistency when getting the config_functest.yaml"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common.sh | 6 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 10 |
2 files changed, 6 insertions, 10 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 |