From eaee6ef773200ca1e077f1d3ba9ecde19a6ecb8c Mon Sep 17 00:00:00 2001
From: niusmallnan <niusmallnan@gmail.com>
Date: Fri, 26 Jan 2018 21:47:41 +0800
Subject: [PATCH] Make sure we can control whether INTEGRATION-TEST is executed

---
 Dockerfile.dapper |  2 +-
 scripts/release   | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 04932eb0..5a01f517 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -39,7 +39,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
 
 ########## Dapper Configuration #####################
 
-ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR
+ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR INTEGRATION_TESTS
 ENV DAPPER_DOCKER_SOCKET true
 ENV DAPPER_SOURCE /go/src/github.com/rancher/os
 ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel
diff --git a/scripts/release b/scripts/release
index 014eb8d1..9cc661ed 100755
--- a/scripts/release
+++ b/scripts/release
@@ -13,13 +13,19 @@ echo PREPARE
 ./scripts/prepare
 echo PACKAGE
 ./scripts/package
-if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
-	export INTEGRATION_TESTS=1
-	echo INTEGRATION-TEST
-	./scripts/integration-test
+
+if [[ "$INTEGRATION_TESTS" != "" ]]; then
+    if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
+        export INTEGRATION_TESTS=1
+    else
+        export INTEGRATION_TESTS=0
+    fi
+fi
+if [[ "$INTEGRATION_TESTS" != "1" ]]; then
+    echo INTEGRATION-TEST
+    ./scripts/integration-test
 else
-	export INTEGRATION_TESTS=0
-	echo "Skipping integration tests"
+    echo "Skipping integration tests"
 fi
 
 if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then