Merge "Add control to redirect rally stderr"

[functest.git] / docker / common.sh

diff --git a/docker/common.sh b/docker/common.sh
index f21263c..c1c7839 100755 (executable)
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -20,6 +20,18 @@
 #
 # 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
+#
+# 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
+#
+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
@@ -49,8 +61,6 @@ RALLY_VENV_DIR=$(cat $config_file | grep -w dir_rally_inst | awk 'END {print $NF
 # Repos
 RALLY_BRANCH=$(cat $config_file | grep -w rally_branch | awk 'END {print $NF}')
 RALLY_COMMIT=$(cat $config_file | grep -w rally_commit | awk 'END {print $NF}')
-FUNCTEST_BRANCH=$(cat $config_file | grep -w functest_branch | awk 'END {print $NF}')
-FUNCTEST_COMMIT=$(cat $config_file | grep -w functest_commit | awk 'END {print $NF}')
 RELENG_BRANCH=$(cat $config_file | grep -w releng_branch | awk 'END {print $NF}')
 RELENG_COMMIT=$(cat $config_file | grep -w releng_commit | awk 'END {print $NF}')
 VIMS_BRANCH=$(cat $config_file | grep -w vims_test_branch | awk 'END {print $NF}')
@@ -61,6 +71,8 @@ ONOS_BRANCH=$(cat $config_file | grep -w onos_branch | awk 'END {print $NF}')
 ONOS_COMMIT=$(cat $config_file | grep -w onos_commit | awk 'END {print $NF}')
 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}')
 
 
 echo "_____Parsed needed data from ${config_file}:"
@@ -76,8 +88,6 @@ echo "FUNCTEST_CONF_DIR=${FUNCTEST_CONF_DIR}"
 echo "FUNCTEST_DATA_DIR=${FUNCTEST_DATA_DIR}"
 echo "RALLY_VENV_DIR=${RALLY_VENV_DIR}"
 echo "####### Repositories #######"
-echo "FUNCTEST_BRANCH=${FUNCTEST_BRANCH}"
-echo "FUNCTEST_COMMIT=${FUNCTEST_COMMIT}"
 echo "RELENG_BRANCH=${RELENG_BRANCH}"
 echo "RELENG_COMMIT=${RELENG_COMMIT}"
 echo "RALLY_BRANCH=${RALLY_BRANCH}"
@@ -88,6 +98,8 @@ echo "ONOS_BRANCH=${ONOS_BRANCH}"
 echo "ONOS_COMMIT=${ONOS_COMMIT}"
 echo "PROMISE_BRANCH=${PROMISE_BRANCH}"
 echo "PROMISE_COMMIT=${PROMISE_COMMIT}"
+echo "OVNO_BRANCH=${OVNO_BRANCH}"
+echo "OVNO_COMMIT=${OVNO_COMMIT}"
 echo "############################"
 
 info ()  {