From eb5abe94afaa09333676457a9a689be3e42e39a4 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 18 Apr 2016 15:32:51 +0200 Subject: Remove all the repo handling in prepare_env JIRA: FUNCTEST-203 Since almost all the repos always pull from master and latest, this is about saving some time and to avoid needing internet to pull or checkout the repos. The needed repos content has to be present in the docker image. Change-Id: Ia6e1ed2b5d5b2aff8661a38eb64a081cc8016019 Signed-off-by: jose.lausuch --- docker/common.sh | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) (limited to 'docker/common.sh') diff --git a/docker/common.sh b/docker/common.sh index 0d2cfb9b0..ccb653f88 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -61,52 +61,6 @@ FUNCTEST_CONF_DIR=$(cat $config_file | grep -w dir_functest_conf | awk 'END {pri FUNCTEST_DATA_DIR=$(cat $config_file | grep -w dir_functest_data | awk 'END {print $NF}') 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}') -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}') -VIMS_COMMIT=$(cat $config_file | grep -w vims_test_commit | awk 'END {print $NF}') -BGPVPN_BRANCH=$(cat $config_file | grep -w bgpvpn_branch | awk 'END {print $NF}') -BGPVPN_COMMIT=$(cat $config_file | grep -w bgpvpn_commit | awk 'END {print $NF}') -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}') -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 #######" -echo "REPOS_DIR=${REPOS_DIR}" -echo "FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR}" -echo "RALLY_REPO_DIR=${RALLY_REPO_DIR}" -echo "RELENG_REPO_DIR=${RELENG_REPO_DIR}" -echo "VIMS_REPO_DIR=${VIMS_REPO_DIR}" -echo "FUNCTEST_DIR=${FUNCTEST_DIR}" -echo "FUNCTEST_RESULTS_DIR=${FUNCTEST_RESULTS_DIR}" -echo "FUNCTEST_CONF_DIR=${FUNCTEST_CONF_DIR}" -echo "FUNCTEST_DATA_DIR=${FUNCTEST_DATA_DIR}" -echo "RALLY_VENV_DIR=${RALLY_VENV_DIR}" -echo "####### Repositories #######" -echo "RELENG_BRANCH=${RELENG_BRANCH}" -echo "RELENG_COMMIT=${RELENG_COMMIT}" -echo "RALLY_BRANCH=${RALLY_BRANCH}" -echo "RALLY_COMMIT=${RALLY_COMMIT}" -echo "VIMS_BRANCH=${VIMS_BRANCH}" -echo "VIMS_COMMIT=${VIMS_COMMIT}" -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 "DOCTOR_BRANCH=${DOCTOR_BRANCH}" -echo "DOCTOR_COMMIT=${DOCTOR_COMMIT}" -echo "############################" info () { logger -s -t "FUNCTEST.info" "$*" -- cgit 1.2.3-korg