[BGPVPN] Remove odl-vpnservice test cases

[functest.git] / docker / common.sh

diff --git a/docker/common.sh b/docker/common.sh
index 1f1cc75..0d2cfb9 100755 (executable)
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -23,8 +23,12 @@
 
 # this pull is to be removed right before the B release, once we build
 # a release candidate docker
-cd $repos_dir/functest
-git pull
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
 
 mkdir -p /home/opnfv/functest/conf
 config_file=/home/opnfv/functest/conf/config_functest.yaml
@@ -45,6 +49,11 @@ RALLY_REPO_DIR=$(cat $config_file | grep -w dir_repo_rally | awk 'END {print $NF
 RELENG_REPO_DIR=$(cat $config_file | grep -w dir_repo_releng | awk 'END {print $NF}')
 VIMS_REPO_DIR=$(cat $config_file | grep -w dir_repo_vims_test | awk 'END {print $NF}')
 BGPVPN_REPO_DIR=$(cat $config_file | grep -w dir_repo_bgpvpn | awk 'END {print $NF}')
+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}')
@@ -67,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 #######"
@@ -94,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 ()  {