From 7d90cce887f1e02a7ff29287b8305cdf1b2e53f0 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 11 Mar 2021 12:50:18 -0600
Subject: [PATCH 1/2] make add-itest-user scripts more verbose

---
 .circle/add-itest-user.sh            | 2 +-
 scripts/travis/add-itest-user-key.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circle/add-itest-user.sh b/.circle/add-itest-user.sh
index b78a62e5b9..7685a9e676 100755
--- a/.circle/add-itest-user.sh
+++ b/.circle/add-itest-user.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 if [ "$(whoami)" != 'root' ]; then
     echo 'Please run with sudo'
diff --git a/scripts/travis/add-itest-user-key.sh b/scripts/travis/add-itest-user-key.sh
index 504087dfdc..a8ae6f6f8e 100755
--- a/scripts/travis/add-itest-user-key.sh
+++ b/scripts/travis/add-itest-user-key.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 mkdir -p ~/.ssh
 
 # Generate ssh keys on StackStorm box and copy over public key into remote box.
 ssh-keygen -f ~/.ssh/st2_id_rsa -P ""
 
 # Authorize key-base acces
-sudo bash -c "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
+sudo bash -xc "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
 sudo chmod 0600 ~/.ssh/authorized_keys
 sudo chmod 0700 ~/.ssh
 sudo chown -R "${ST2_CI_USER}:${ST2_CI_USER}" ~/.ssh

From 6f9703d0cf9f35fe28f8a49831f67ceff00170e1 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 11 Mar 2021 13:06:15 -0600
Subject: [PATCH 2/2] use sudo -E to preserve env vars

---
 scripts/travis/add-itest-user-key.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/travis/add-itest-user-key.sh b/scripts/travis/add-itest-user-key.sh
index a8ae6f6f8e..7cf9d1452d 100755
--- a/scripts/travis/add-itest-user-key.sh
+++ b/scripts/travis/add-itest-user-key.sh
@@ -6,8 +6,9 @@ mkdir -p ~/.ssh
 # Generate ssh keys on StackStorm box and copy over public key into remote box.
 ssh-keygen -f ~/.ssh/st2_id_rsa -P ""
 
+# sudo -E = preserve HOME var
 # Authorize key-base acces
-sudo bash -xc "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
-sudo chmod 0600 ~/.ssh/authorized_keys
-sudo chmod 0700 ~/.ssh
-sudo chown -R "${ST2_CI_USER}:${ST2_CI_USER}" ~/.ssh
+sudo -E bash -xc "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
+sudo -E chmod 0600 ~/.ssh/authorized_keys
+sudo -E chmod 0700 ~/.ssh
+sudo -E chown -R "${ST2_CI_USER}:${ST2_CI_USER}" ~/.ssh