[GitHub] nabarunnag closed pull request #32: GEODE-6135 - Changes to support running in CI

[GitBox <gi...@apache.org>]

nabarunnag closed pull request #32: GEODE-6135 - Changes to support running in CI
URL: https://github.com/apache/geode-benchmarks/pull/32
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/infrastructure/scripts/aws/run_against_baseline.sh b/infrastructure/scripts/aws/run_against_baseline.sh
index 1bcb935..1890b45 100755
--- a/infrastructure/scripts/aws/run_against_baseline.sh
+++ b/infrastructure/scripts/aws/run_against_baseline.sh
@@ -22,7 +22,7 @@ TAG=${1}
 BRANCH=${2:-develop}
 BASELINE=${3:-"rel/v1.8.0"}
 BENCHMARK_BRANCH=${4:-develop}
-OUTPUT=output-${DATE}-${TAG}
-
-./run_tests.sh ${TAG} ${BRANCH} ${OUTPUT}/branch ${BENCHMARK_BRANCH}
-./run_tests.sh ${TAG} ${BASELINE} ${OUTPUT}/baseline ${BENCHMARK_BRANCH}
+DEFAULT_OUTPUT_DIR=output-${DATE}-${TAG}
+OUTPUT=${5:-${DEFAULT_OUTPUT_DIR}}
+./run_tests.sh ${TAG} ${BRANCH} ${BENCHMARK_BRANCH} ${OUTPUT}/branch
+./run_tests.sh ${TAG} ${BASELINE} ${BENCHMARK_BRANCH} ${OUTPUT}/baseline
diff --git a/infrastructure/scripts/aws/run_tests.sh b/infrastructure/scripts/aws/run_tests.sh
index 2295c80..ca583d0 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -24,7 +24,7 @@ BENCHMARK_BRANCH=${3:-develop}
 OUTPUT=${4:-output-${DATE}-${TAG}}
 PREFIX="geode-performance-${TAG}"
 
-SSH_OPTIONS="-i ~/.ssh/geode-benchmarks/${TAG}.pem"
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/.ssh/geode-benchmarks/${TAG}.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`
@@ -34,10 +34,9 @@ echo "HOSTS=${HOSTS}"
 
 ssh ${SSH_OPTIONS} geode@$FIRST_INSTANCE "\
   rm -rf geode-benchmarks geode && \
-  git clone --depth=1 https://github.com/apache/geode --branch ${BRANCH} geode && \
-  cd geode && \
-  ./gradlew pTML -PversionNumber=${DATE} -PreleaseType="-BENCHMARKBUILD" && \
-  cd .. && \
+  git clone https://github.com/apache/geode geode && \
+  (pushd geode; git checkout ${BRANCH}) && \
+  (pushd geode; ./gradlew pTML -PversionNumber=${DATE} -PreleaseType="-BENCHMARKBUILD") && \
   git clone https://github.com/apache/geode-benchmarks --branch ${BENCHMARK_BRANCH} && \
   cd geode-benchmarks && \
   ./gradlew -PgeodeVersion=${DATE}-BENCHMARKBUILD benchmark -Phosts=${HOSTS}"
@@ -48,4 +47,3 @@ mkdir -p ${OUTPUT}
 scp ${SSH_OPTIONS} -r geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/reports ${OUTPUT}/reports
 BENCHMARK_DIRECTORY="$(ssh ${SSH_OPTIONS} geode@${FIRST_INSTANCE} ls -l geode-benchmarks/geode-benchmarks/build/ | grep benchmark | awk 'NF>1{print $NF}')"
 scp ${SSH_OPTIONS} -r geode@${FIRST_INSTANCE}:geode-benchmarks/geode-benchmarks/build/${BENCHMARK_DIRECTORY} ${OUTPUT}
-
diff --git a/infrastructure/src/main/java/org/apache/geode/infrastructure/aws/DestroyCluster.java b/infrastructure/src/main/java/org/apache/geode/infrastructure/aws/DestroyCluster.java
index 5018aab..c6f7070 100644
--- a/infrastructure/src/main/java/org/apache/geode/infrastructure/aws/DestroyCluster.java
+++ b/infrastructure/src/main/java/org/apache/geode/infrastructure/aws/DestroyCluster.java
@@ -26,6 +26,7 @@
 
 import software.amazon.awssdk.services.ec2.Ec2Client;
 import software.amazon.awssdk.services.ec2.model.DeleteKeyPairRequest;
+import software.amazon.awssdk.services.ec2.model.DeleteKeyPairResponse;
 import software.amazon.awssdk.services.ec2.model.DeleteLaunchTemplateRequest;
 import software.amazon.awssdk.services.ec2.model.DeletePlacementGroupRequest;
 import software.amazon.awssdk.services.ec2.model.DeleteSecurityGroupRequest;
@@ -59,11 +60,12 @@ public static void main(String[] args) throws InterruptedException {
 
   private static void deleteKeyPair(String benchmarkTag) {
     try {
-      ec2.deleteKeyPair(
-          DeleteKeyPairRequest.builder().keyName(AwsBenchmarkMetadata.keyPair(benchmarkTag))
-              .build());
+      System.out.println("Deleting cluster keypair: " + AwsBenchmarkMetadata.keyPair(benchmarkTag));
+      ec2.deleteKeyPair(DeleteKeyPairRequest.builder()
+          .keyName(AwsBenchmarkMetadata.keyPair(benchmarkTag))
+          .build());
       Files.deleteIfExists(Paths.get(AwsBenchmarkMetadata.keyPairFileName(benchmarkTag)));
-      System.out.println("Key Pair for cluster'" + benchmarkTag + "' deleted.");
+      System.out.println("Key Pair for cluster '" + benchmarkTag + "' deleted.");
     } catch (Exception e) {
       System.out.println("We got an exception while deleting the Key pair");
       System.out.println("Exception message: " + e);
@@ -74,8 +76,8 @@ private static void deleteInstances(String benchmarkTag) throws InterruptedExcep
     // delete instances
     try {
       DescribeInstancesResponse dir = ec2.describeInstances(DescribeInstancesRequest.builder()
-          .filters(
-              Filter.builder().name("tag:" + BenchmarkMetadata.PREFIX).values(benchmarkTag).build())
+          .filters(Filter.builder()
+              .name("tag:" + BenchmarkMetadata.PREFIX).values(benchmarkTag).build())
           .build());
       Stream<Instance> instanceStream = dir.reservations()
           .stream()


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services