[geode-benchmarks] branch develop updated: Revert "Prevent too many keys being offered to ssh server (#103)"

[heybales]

This is an automated email from the ASF dual-hosted git repository.

heybales pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5cde24b  Revert "Prevent too many keys being offered to ssh server 
(#103)"
5cde24b is described below

commit 5cde24b77b2fe00374a20f60fb6ea0b01da3d303
Author: Helena A. Bales <hba...@pivotal.io>
AuthorDate: Fri Sep 13 09:47:12 2019 -0700

    Revert "Prevent too many keys being offered to ssh server (#103)"
    
    This reverts commit 5062dccfa91cb6acebb18cd396810932bce1163a.
    
    This commit appears to cause benchmark task in CI to timeout. Reverting
    while we investigate root cause.
---
 infrastructure/scripts/aws/copy_to_cluster.sh | 2 +-
 infrastructure/scripts/aws/run_on_cluster.sh  | 2 +-
 infrastructure/scripts/aws/run_tests.sh       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infrastructure/scripts/aws/copy_to_cluster.sh 
b/infrastructure/scripts/aws/copy_to_cluster.sh
index 9ae5fdc..9b9a95c 100755
--- a/infrastructure/scripts/aws/copy_to_cluster.sh
+++ b/infrastructure/scripts/aws/copy_to_cluster.sh
@@ -60,7 +60,7 @@ if [[ -z "${AWS_ACCESS_KEY_ID}" ]]; then
   export AWS_PROFILE="geode-benchmarks"
 fi
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 
 for host in ${HOSTS}; do
diff --git a/infrastructure/scripts/aws/run_on_cluster.sh 
b/infrastructure/scripts/aws/run_on_cluster.sh
index bcc218b..b959221 100755
--- a/infrastructure/scripts/aws/run_on_cluster.sh
+++ b/infrastructure/scripts/aws/run_on_cluster.sh
@@ -60,7 +60,7 @@ if [[ -z "${AWS_ACCESS_KEY_ID}" ]]; then
   export AWS_PROFILE="geode-benchmarks"
 fi
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 
 for host in ${HOSTS}; do
diff --git a/infrastructure/scripts/aws/run_tests.sh 
b/infrastructure/scripts/aws/run_tests.sh
index 39d3590..3dd4d0d 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -141,7 +141,7 @@ fixRepoName() {
 BENCHMARK_REPO=$(fixRepoName ${BENCHMARK_REPO})
 REPO=$(fixRepoName ${REPO})
 
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o 
IdentitiesOnly=yes -i ~/.geode-benchmarks/${TAG}-privkey.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i 
~/.geode-benchmarks/${TAG}-privkey.pem"
 HOSTS=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PrivateIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text`
 HOSTS=$(echo ${HOSTS} | tr ' ' ',')
 FIRST_INSTANCE=`aws ec2 describe-instances --query 
'Reservations[*].Instances[*].PublicIpAddress' --filter 
"Name=tag:geode-benchmarks,Values=${TAG}" --output text | cut -f 1`