Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
Make sure we can control whether INTEGRATION-TEST is executed
Browse files Browse the repository at this point in the history
  • Loading branch information
niusmallnan committed Jan 26, 2018
1 parent 929bb5a commit eaee6ef
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions scripts/release
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eaee6ef

Please sign in to comment.