diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/qtip_creds.sh | 22 | ||||
| -rw-r--r-- | data/ref_results/index_calculation.py | 9 |
2 files changed, 18 insertions, 13 deletions
diff --git a/data/qtip_creds.sh b/data/qtip_creds.sh index 490de859..bcd4c246 100755 --- a/data/qtip_creds.sh +++ b/data/qtip_creds.sh @@ -3,21 +3,25 @@ DEST_IP=$1 echo $INSTALLER_TYPE echo $INSTALLER_IP - +sshoptions="-o StrictHostKeyChecking=no" case "$INSTALLER_TYPE" in apex) - PSWD="vagrant";; + PSWD="vagrant" + ;; fuel) - PSWD="r00tme";; + PSWD="r00tme" + sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root + sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" + ;; compass) - PSWD="root";; + PSWD="root" + sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root + sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" + ;; joid) PSWD="joid";; *) echo "Unkown installer $INSTALLER_TYPE specified";; esac -echo $PWD -sshoptions="-o StrictHostKeyChecking=no" -sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root -sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey.pub" - diff --git a/data/ref_results/index_calculation.py b/data/ref_results/index_calculation.py index 488ed867..74c8b14b 100644 --- a/data/ref_results/index_calculation.py +++ b/data/ref_results/index_calculation.py @@ -36,9 +36,10 @@ def generic_index(dict_gen,testcase,reference_num,*args): count=count+1 for arg in args: if arg == args[c-1]: - result=float(dict_temp.get(str(arg))) + try: + result=float(dict_temp.get(str(arg))) + except ValueError: + result=float(dict_temp.get(str(arg))[:-1])*1000 dict_temp=dict_temp.get(str(arg)) total=total+result - return compute_index(total, reference_num, count) - -
\ No newline at end of file + return compute_index(total, reference_num, count) |