From 54e2f870d2b9139e21788c92e7af9f6ea01e7f6a Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Sun, 18 Dec 2022 11:32:20 -0800
Subject: [PATCH] ci/aws: Fix env on ubuntu

---
 ci/release/aws/ensure.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/release/aws/ensure.sh b/ci/release/aws/ensure.sh
index 66cc1cb1b..d5de7dfca 100755
--- a/ci/release/aws/ensure.sh
+++ b/ci/release/aws/ensure.sh
@@ -381,6 +381,9 @@ init_remote_env() {
   if sh_c ssh "$REMOTE_HOST" uname | grep -qF Darwin; then
     sh_c ssh "$REMOTE_HOST" "sudo launchctl stop com.openssh.sshd"
   else
+    # ubuntu has $PATH hard coded in /etc/environment for some reason. It takes precedence
+    # over ~/.ssh/environment.
+    sh_c ssh "$REMOTE_HOST" "sudo rm /etc/environment"
     sh_c ssh "$REMOTE_HOST" "sudo systemctl restart sshd"
   fi
 }