x/sahara-ci-config
Code Issues Proposed changes

Update tempest before tests and fix plugin configuration

Browse Source 
Tempest repository is now updated before running a tempest-related test.

Also, adapt to the new signature of write_sahara_main_conf() and pass
the plugin(s) version; the parameter was overwritten with an empty
value as the 3rd parameter was not specified, even if set in the line
before.

Change-Id: I2bfa40bbf2a9ab252fa176fc4b24c5f8b28c9071
This commit is contained in:
Luigi Toscano
2015-09-17 17:17:25 +02:00
parent 3bb5dc76e5
commit 5aac14378a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slave-scripts/tempest.sh
View File

@@ -19,6 +19,12 @@ else
fi fi
sahara_conf_path=$SAHARA_PATH/etc/sahara/sahara.conf sahara_conf_path=$SAHARA_PATH/etc/sahara/sahara.conf
# update tempest
pushd /home/jenkins/tempest/ &>/dev/null
git pull
git log --pretty=oneline -n 1
popd &>/dev/null
cd /home/jenkins cd /home/jenkins
cp -r $SAHARA_PATH/sahara/tests/tempest tempest/ cp -r $SAHARA_PATH/sahara/tests/tempest tempest/
@@ -49,8 +55,7 @@ insert_config_value tempest/scenario/data_processing/etc/sahara_tests.conf data_
enable_pypi enable_pypi
sudo pip install $SAHARA_PATH/. --no-cache-dir sudo pip install $SAHARA_PATH/. --no-cache-dir
insert_config_value $sahara_conf_path DEFAULT plugins fake write_sahara_main_conf $sahara_conf_path "direct" "fake"
write_sahara_main_conf $sahara_conf_path "direct"
start_sahara $sahara_conf_path start_sahara $sahara_conf_path
# Prepare env and install saharaclient # Prepare env and install saharaclient