diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 88ef8adc..416d7a0d 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..d91bf382 100755 --- a/scripts/release +++ b/scripts/release @@ -13,12 +13,18 @@ echo PREPARE ./scripts/prepare echo PACKAGE ./scripts/package -if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then - export INTEGRATION_TESTS=1 + +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" fi