x/sahara-ci-config
Code Issues Proposed changes

Credentials is removed from run command

Browse Source 
Scenario framework uses env variables for running tests

Change-Id: I17cc5770eda2f5c840f3af6aea82e06266f318d2
This commit is contained in:
Evgeny Sikachev 2016-09-15 13:07:45 +03:00
parent 332c4a65ce
commit 2e4127f22d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slave-scripts/functions-common.sh
View File

@ -109,7 +109,6 @@ run_tests() {
local concurrency=${2:-"1"} local concurrency=${2:-"1"}
echo "Integration tests are started" echo "Integration tests are started"
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
local scenario_credentials="$tests_etc/credentials.yaml.mako"
local scenario_edp="$tests_etc/edp.yaml.mako" local scenario_edp="$tests_etc/edp.yaml.mako"
if [ ! -f $scenario_edp ]; then if [ ! -f $scenario_edp ]; then
scenario_edp="$tests_etc/edp.yaml" scenario_edp="$tests_etc/edp.yaml"
@ -117,7 +116,7 @@ run_tests() {
# Temporary use additional log file, due to wrong status code from tox scenario tests # Temporary use additional log file, due to wrong status code from tox scenario tests
pushd $SAHARA_TESTS_PATH pushd $SAHARA_TESTS_PATH
# tox -e scenario -- --verbose -V $template_vars_file $scenario_credentials $scenario_edp $scenario_config || failure "Integration tests are failed" # tox -e scenario -- --verbose -V $template_vars_file $scenario_credentials $scenario_edp $scenario_config || failure "Integration tests are failed"
tox -e venv -- sahara-scenario --verbose -V $template_vars_file $scenario_credentials $scenario_edp $scenario_config | tee tox.log tox -e venv -- sahara-scenario --verbose -V $template_vars_file $scenario_edp $scenario_config | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}') STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}')
if [ "$STATUS" != "0" ]; then failure "Integration tests have failed"; fi if [ "$STATUS" != "0" ]; then failure "Integration tests have failed"; fi
popd popd
@ -183,13 +182,6 @@ write_tests_conf() {
local image_name=$3 local image_name=$3
NETWORK="neutron" NETWORK="neutron"
echo "[DEFAULT] echo "[DEFAULT]
OS_USERNAME: $OS_USERNAME
OS_PASSWORD: $OS_PASSWORD
OS_TENANT_NAME: $OS_TENANT_NAME
OS_AUTH_URL: $OS_AUTH_URL
network_type: $NETWORK
network_public_name: public
network_private_name: private
${image_prefix}_image: $image_name ${image_prefix}_image: $image_name
cluster_name: $cluster_name cluster_name: $cluster_name
ci_flavor_id: $ci_flavor_id ci_flavor_id: $ci_flavor_id