SERVER-56478 Run powercycle with extended host lifetime for easier debugging

6 files changed, 69 insertions, 21 deletions

diff --git a/evergreen/compiled_binaries_get.sh b/evergreen/compiled_binaries_get.sh
new file mode 100755
index 00000000000..b007fd97709
--- /dev/null
+++ b/evergreen/compiled_binaries_get.sh
@@ -0,0 +1,46 @@
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+. "$DIR/prelude.sh"
+
+cd src
+
+set -o errexit
+set -o verbose
+
+activate_venv
+
+rm -rf /data/install dist-test/bin
+
+edition="${multiversion_edition}"
+platform="${multiversion_platform}"
+architecture="${multiversion_architecture}"
+
+if [ ! -z "${multiversion_edition_42_or_later}" ]; then
+  edition="${multiversion_edition_42_or_later}"
+fi
+if [ ! -z "${multiversion_platform_42_or_later}" ]; then
+  platform="${multiversion_platform_42_or_later}"
+fi
+if [ ! -z "${multiversion_architecture_42_or_later}" ]; then
+  architecture="${multiversion_architecture_42_or_later}"
+fi
+
+if [ ! -z "${multiversion_edition_44_or_later}" ]; then
+  edition="${multiversion_edition_44_or_later}"
+fi
+if [ ! -z "${multiversion_platform_44_or_later}" ]; then
+  platform="${multiversion_platform_44_or_later}"
+fi
+if [ ! -z "${multiversion_architecture_44_or_later}" ]; then
+  architecture="${multiversion_architecture_44_or_later}"
+fi
+
+# This is primarily for tests for infrastructure which don't always need the latest
+# binaries.
+$python buildscripts/resmoke.py setup-multiversion \
+  --installDir /data/install \
+  --linkDir dist-test/bin \
+  --edition $edition \
+  --platform $platform \
+  --architecture $architecture \
+  --githubOauthToken "${github_token}" \
+  --useLatest master
diff --git a/evergreen/move_multiversion_binaries.sh b/evergreen/move_multiversion_binaries.sh
deleted file mode 100755
index 6429150bee2..00000000000
--- a/evergreen/move_multiversion_binaries.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -o verbose
-
-cd src
-# powercycle expects the binaries to be in dist-test/bin
-mkdir -p dist-test/bin
-mv /data/multiversion/* dist-test/bin/
diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh
index cd7f1d942f1..d287d4e4b10 100644
--- a/evergreen/multiversion_setup.sh
+++ b/evergreen/multiversion_setup.sh
@@ -74,16 +74,3 @@ $python buildscripts/resmoke.py setup-multiversion \
   --architecture $architecture \
   --githubOauthToken "${github_token}" \
   --useLatest 4.4 4.7 4.8 4.9
-
-# This is primarily for tests for infrastructure which don't always need the latest
-# binaries.
-if [ ! -z "${install_master_bin}" ]; then
-  $python buildscripts/resmoke.py setup-multiversion \
-    --installDir /data/install \
-    --linkDir /data/multiversion \
-    --edition $edition \
-    --platform $platform \
-    --architecture $architecture \
-    --githubOauthToken "${github_token}" \
-    --useLatest master
-fi
diff --git a/evergreen/powercycle_run_test.sh b/evergreen/powercycle_run_test.sh
index 6aa63c669e6..a0703faa161 100644
--- a/evergreen/powercycle_run_test.sh
+++ b/evergreen/powercycle_run_test.sh
@@ -18,5 +18,6 @@ trap 'echo $? > error_exit.txt; exit 0' EXIT
 set +o errexit
 eval $python -u buildscripts/resmoke.py powercycle run \
   "--sshUserHost=$(printf "%s@%s" "$user" "${private_ip_address}") \
-  --sshConnection=\"-i ${private_key_file}\" \
-  --taskName=${task_name}"
+  --sshConnection=\"-i powercycle.pem\" \
+  --taskName=${task_name} \
+  ${run_powercycle_args}"
diff --git a/evergreen/powercycle_sentinel_run.sh b/evergreen/powercycle_sentinel_run.sh
new file mode 100755
index 00000000000..f36f94dda1d
--- /dev/null
+++ b/evergreen/powercycle_sentinel_run.sh
@@ -0,0 +1,10 @@
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+. "$DIR/prelude.sh"
+
+cd src
+
+set -o errexit
+set -o verbose
+
+activate_venv
+$python buildscripts/powercycle_sentinel.py ../expansions.yml
diff --git a/evergreen/powercycle_tasks_generate.sh b/evergreen/powercycle_tasks_generate.sh
new file mode 100755
index 00000000000..15b7555790e
--- /dev/null
+++ b/evergreen/powercycle_tasks_generate.sh
@@ -0,0 +1,10 @@
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+. "$DIR/prelude.sh"
+
+cd src
+
+set -o errexit
+set -o verbose
+
+activate_venv
+$python buildscripts/evergreen_gen_powercycle_tasks.py ../expansions.yml ../powercycle_tasks.json