diff options
| -rw-r--r-- | dashboard/pushtoDB.py | 2 | ||||
| -rwxr-xr-x | data/qtip_creds.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py index 071e1dba..173de239 100644 --- a/dashboard/pushtoDB.py +++ b/dashboard/pushtoDB.py @@ -15,7 +15,7 @@ def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us pod_name = os.environ['NODE_NAME'] params = {"project_name": "qtip", "case_name": case_name, - "pod_name": pod_name, "installer": installer, "creation_date": creation_date, + "pod_name": pod_name, "installer": installer, "start_date": creation_date, "version": "test" , "details": payload} headers = {'Content-Type': 'application/json'} diff --git a/data/qtip_creds.sh b/data/qtip_creds.sh index bf316b4d..6f19305a 100755 --- a/data/qtip_creds.sh +++ b/data/qtip_creds.sh @@ -14,7 +14,8 @@ case "$INSTALLER_TYPE" in 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 $sshoptions -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "grep -q '\-F /dev/null ' /usr/bin/ssh-copy-id || sed -i 's/\(ssh -i.*$\)/\1\n -F \/dev\/null \\\/g' `which ssh-copy-id`" + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" ;; compass) PSWD="root" |