diff options
| -rwxr-xr-x | docker/common.sh | 6 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 10 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 8 |
3 files changed, 9 insertions, 15 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..7c1e79d36 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 @@ -159,10 +157,10 @@ test_exec_priority: 1: vping 2: tempest 3: odl - #4: onos + 4: onos #5: ovno #6: doctor - #7: promise + 7: promise #8: policy-test #9: odl-vpn_service-tests #10: opnfv-yardstick-tc026-sdnvpn @@ -217,7 +215,7 @@ test_exec_priority: ####################################################################### test-dependencies: doctor: - installer: 'fuel' + installer: '(apex)|(fuel)' functest: vims: vping: |