From d5372e73873ce2d413baecdf8ccf8d33d631883e Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Tue, 28 Jun 2022 20:23:30 +0200
Subject: [PATCH] Use PULL_PULL_SHA as gcs location sha if available

---
 tests/e2e/kubetest2-kops/deployer/build.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/kubetest2-kops/deployer/build.go b/tests/e2e/kubetest2-kops/deployer/build.go
index 3dbf98ff72..a813f4aca9 100644
--- a/tests/e2e/kubetest2-kops/deployer/build.go
+++ b/tests/e2e/kubetest2-kops/deployer/build.go
@@ -92,14 +92,17 @@ func defaultStageLocation(kopsRoot string) (string, error) {
 		jobName = defaultJobName
 	}
 
-	cmd := exec.Command("git", "rev-parse", "--short", "HEAD")
-	cmd.SetDir(kopsRoot)
-	output, err := exec.CombinedOutputLines(cmd)
-	if err != nil {
-		return "", err
-	} else if len(output) != 1 {
-		return "", fmt.Errorf("unexpected output from git describe: %v", output)
+	sha := os.Getenv("PULL_PULL_SHA")
+	if sha == "" {
+		cmd := exec.Command("git", "rev-parse", "--short", "HEAD")
+		cmd.SetDir(kopsRoot)
+		output, err := exec.CombinedOutputLines(cmd)
+		if err != nil {
+			return "", err
+		} else if len(output) != 1 {
+			return "", fmt.Errorf("unexpected output from git describe: %v", output)
+		}
+		sha = strings.TrimSpace(output[0])
 	}
-	sha := strings.TrimSpace(output[0])
 	return fmt.Sprintf(defaultGCSPath, jobName, sha), nil
 }