diff --git a/Dockerfile.dapper b/Dockerfile.dapper index a528ef52..9b5a3f58 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -44,7 +44,7 @@ ARG VBOX_MODULES_URL_amd64=https://github.com/rancher/os-vbox/releases/download/ ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services ARG IMAGE_NAME=${OS_REPO}/os -ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION} +ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-1 ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2016.05-3/os-base_amd64.tar.xz ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2016.05-3/os-base_arm64.tar.xz diff --git a/scripts/integration-test b/scripts/integration-test index d96b1961..018ff89f 100755 --- a/scripts/integration-test +++ b/scripts/integration-test @@ -2,6 +2,10 @@ # help: Run Python based integration tests set -e +if [ "$INTEGRATION_TESTS" = 0 ]; then + exit 0 +fi + source $(dirname $0)/version cd $(dirname $0)/../tests/integration diff --git a/scripts/release b/scripts/release index ee10a0b6..158c38ab 100755 --- a/scripts/release +++ b/scripts/release @@ -4,5 +4,6 @@ set -e source $(dirname $0)/version export REPO_VERSION=$VERSION export COMPRESS=lzma +export INTEGRATION_TESTS=0 exec $(dirname $0)/ci