From 8919d9d5d3a9cd1baddde4b36813bfa5f060f7f2 Mon Sep 17 00:00:00 2001
From: pokeeffe-molecula <patrick.okeeffe@molecula.com>
Date: Tue, 11 Jan 2022 15:51:18 -0600
Subject: [PATCH 1/2] change the way we call ssh

---
 .gitlab/.gitlab-ci.yml            | 3 ++-
 qa/scripts/testSamsungGauntlet.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 3f1b4eb0a..e12fd0335 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -279,7 +279,8 @@ gauntlet:
     - docker
     - fbsmoke
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
+#    - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   before_script:
     - apt-get update && apt-get install -y gnupg software-properties-common curl git
diff --git a/qa/scripts/testSamsungGauntlet.sh b/qa/scripts/testSamsungGauntlet.sh
index 8240588ba..2670439c9 100755
--- a/qa/scripts/testSamsungGauntlet.sh
+++ b/qa/scripts/testSamsungGauntlet.sh
@@ -43,7 +43,7 @@ then
 fi
 
 echo "Running (1) testSamsungPayload.sh..."
-ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 1" 
+ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 1" 
 if (( $? != 0 )) 
 then 
     echo "Running 1 testSamsungPayload.sh failed"
@@ -51,7 +51,7 @@ then
 fi
 
 echo "Running (0) testSamsungPayload.sh..."
-ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 0" 
+ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 0" 
 if (( $? != 0 )) 
 then 
     echo "Running 0 testSamsungPayload.sh failed"

From d896953af4b0aa1ddb9a174f9c45d98ae1f413e9 Mon Sep 17 00:00:00 2001
From: pokeeffe-molecula <patrick.okeeffe@molecula.com>
Date: Tue, 11 Jan 2022 18:08:14 -0600
Subject: [PATCH 2/2] stop gauntlet from running on push

---
 .gitlab/.gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index e12fd0335..3f1b4eb0a 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -279,8 +279,7 @@ gauntlet:
     - docker
     - fbsmoke
   rules:
-#    - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
-    - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   before_script:
     - apt-get update && apt-get install -y gnupg software-properties-common curl git