From 47e007ae0b8fcd229097573623d8f198f7cfca23 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Fri, 26 May 2023 08:42:34 -0400
Subject: [PATCH] USHIFT-1284: make test login to microshift host more reliable

---
 test/resources/microshift-host.resource | 6 ++++--
 test/variables.yaml.example             | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/resources/microshift-host.resource b/test/resources/microshift-host.resource
index 74a7f54433..7a1218f1a1 100644
--- a/test/resources/microshift-host.resource
+++ b/test/resources/microshift-host.resource
@@ -13,8 +13,10 @@ Login MicroShift Host
 
     Log  Host: ${USHIFT_HOST}
     SSHLibrary.Open Connection    ${USHIFT_HOST}
-    ${variables}=  Get Variables
-    IF  "\${SSH_PRIV_KEY}" in "${variables}"
+    # If there is an ssh key set in the global configuration, use that to
+    # login to the host. Otherwise assume that the ssh agent is running
+    # and configured properly.
+    IF  '${SSH_PRIV_KEY}'
         SSHLibrary.Login With Public Key    ${USHIFT_USER}    ${SSH_PRIV_KEY}
     ELSE
         SSHLibrary.Login    ${USHIFT_USER}  allow_agent=True
diff --git a/test/variables.yaml.example b/test/variables.yaml.example
index a08e85776d..689c712c71 100644
--- a/test/variables.yaml.example
+++ b/test/variables.yaml.example
@@ -3,5 +3,6 @@ USHIFT_HOST: microshift
 # USHIFT_USER: User to log into MicroShift's host
 USHIFT_USER: microshift
 # SSH Private key to use when logging into MicroShift's host.
-# Unset this variable to use ssh agent.
+# Set this variable to "" to use ssh agent.
+#SSH_PRIV_KEY: ""
 SSH_PRIV_KEY: /home/microshift/.ssh/id_rsa