From 7fc1bf1f07d276970a2af5a25e5f6ac6081c5c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Skrz=C4=99tnicki?=
 <krzysztof.skrzetnicki@goteleport.com>
Date: Tue, 24 May 2022 16:04:51 +0200
Subject: [PATCH] [v8] Set TELEPORT_ETCD_TEST=yes. (#12784) (#12850)

---
 .cloudbuild/scripts/cmd/unit-tests/main.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.cloudbuild/scripts/cmd/unit-tests/main.go b/.cloudbuild/scripts/cmd/unit-tests/main.go
index af6a487ae61d7..48fc835a2d8f1 100644
--- a/.cloudbuild/scripts/cmd/unit-tests/main.go
+++ b/.cloudbuild/scripts/cmd/unit-tests/main.go
@@ -47,11 +47,11 @@ func main() {
 }
 
 type commandlineArgs struct {
-	workspace    string
-	targetBranch string
-	commitSHA    string
-	githubKeySrc string
-	skipUnshallow          bool
+	workspace     string
+	targetBranch  string
+	commitSHA     string
+	githubKeySrc  string
+	skipUnshallow bool
 }
 
 func parseCommandLine() (commandlineArgs, error) {
@@ -150,8 +150,10 @@ func runUnitTests(workspace string) error {
 
 	cmd := exec.Command("make", "test")
 	cmd.Dir = workspace
-	cmd.Env = append(os.Environ(), gomodcache, "TELEPORT_ETCD_TEST=yes")
-	cmd.Env = append(os.Environ(), "TELEPORT_XAUTH_TEST=yes")
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, gomodcache)
+	cmd.Env = append(cmd.Env, "TELEPORT_ETCD_TEST=yes")
+	cmd.Env = append(cmd.Env, "TELEPORT_XAUTH_TEST=yes")
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr