From 8c0224e154486b4676db7a928d742a05d938fa7c Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Thu, 20 Dec 2018 23:08:49 -0500
Subject: [PATCH] Fix integTest target by honoring TEST_ENVIRONMENT

This backports a small portion of #9724.
---
 dev-tools/mage/integtest.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go
index 86c50052f98f..ddc59fb8f699 100644
--- a/dev-tools/mage/integtest.go
+++ b/dev-tools/mage/integtest.go
@@ -98,6 +98,10 @@ func StopIntegTestEnv() error {
 		return nil
 	}
 
+	if _, skip := skipIntegTest(); skip {
+		return nil
+	}
+
 	composeEnv, err := integTestDockerComposeEnvVars()
 	if err != nil {
 		return err
@@ -241,6 +245,10 @@ func haveIntegTestEnvRequirements() error {
 
 // skipIntegTest returns true if integ tests should be skipped.
 func skipIntegTest() (reason string, skip bool) {
+	if IsInIntegTestEnv() {
+		return "", false
+	}
+
 	// Honor the TEST_ENVIRONMENT value if set.
 	if testEnvVar, isSet := os.LookupEnv("TEST_ENVIRONMENT"); isSet {
 		enabled, err := strconv.ParseBool(testEnvVar)