From 716abc42abd73241c42e432c87c362118b09026a Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 22 Feb 2016 12:51:02 +0100 Subject: Add git support for Doctor repo in config_functest.yaml Change-Id: I10ad0dc6cd6697a2a93f5e11edcdd69f70f86c5f Signed-off-by: jose.lausuch (cherry picked from commit e0e52cec1e43491714f0ce078a7722e2cc3d9fca) --- docker/common.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'docker/common.sh') diff --git a/docker/common.sh b/docker/common.sh index 7d973ab26..0d2cfb9b0 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -29,8 +29,6 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 # -cd $repos_dir/functest -git pull mkdir -p /home/opnfv/functest/conf config_file=/home/opnfv/functest/conf/config_functest.yaml @@ -54,6 +52,8 @@ BGPVPN_REPO_DIR=$(cat $config_file | grep -w dir_repo_bgpvpn | awk 'END {print $ ONOS_REPO_DIR=$(cat $config_file | grep -w dir_repo_onos | awk 'END {print $NF}') PROMISE_REPO_DIR=$(cat $config_file | grep -w dir_repo_promise | awk 'END {print $NF}') OVNO_REPO_DIR=$(cat $config_file | grep -w dir_repo_ovno | awk 'END {print $NF}') +DOCTOR_REPO_DIR=$(cat $config_file | grep -w dir_repo_doctor | awk 'END {print $NF}') + FUNCTEST_DIR=$(cat $config_file | grep -w dir_functest | awk 'END {print $NF}') FUNCTEST_RESULTS_DIR=$(cat $config_file | grep -w dir_results | awk 'END {print $NF}') @@ -76,7 +76,8 @@ PROMISE_BRANCH=$(cat $config_file | grep -w promise_branch | awk 'END {print $NF PROMISE_COMMIT=$(cat $config_file | grep -w promise_commit | awk 'END {print $NF}') OVNO_BRANCH=$(cat $config_file | grep -w ovno_branch | awk 'END {print $NF}') OVNO_COMMIT=$(cat $config_file | grep -w ovno_commit | awk 'END {print $NF}') - +DOCTOR_BRANCH=$(cat $config_file | grep -w doctor_branch | awk 'END {print $NF}') +DOCTOR_COMMIT=$(cat $config_file | grep -w doctor_commit | awk 'END {print $NF}') echo "_____Parsed needed data from ${config_file}:" echo "####### Directories #######" @@ -103,6 +104,8 @@ echo "PROMISE_BRANCH=${PROMISE_BRANCH}" echo "PROMISE_COMMIT=${PROMISE_COMMIT}" echo "OVNO_BRANCH=${OVNO_BRANCH}" echo "OVNO_COMMIT=${OVNO_COMMIT}" +echo "DOCTOR_BRANCH=${DOCTOR_BRANCH}" +echo "DOCTOR_COMMIT=${DOCTOR_COMMIT}" echo "############################" info () { -- cgit 1.2.3-korg