rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-04-28 19:34:45 +00:00
Code Issues Releases Wiki Activity

Make sure we can control whether INTEGRATION-TEST is executed

Browse Source
This commit is contained in:
niusmallnan 2018-01-26 21:47:41 +08:00
parent 929bb5abce
commit eaee6ef773
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.dapper
View File

@ -39,7 +39,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
########## Dapper Configuration ##################### ########## 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_DOCKER_SOCKET true
ENV DAPPER_SOURCE /go/src/github.com/rancher/os ENV DAPPER_SOURCE /go/src/github.com/rancher/os
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel

18
scripts/release
View File

@ -13,13 +13,19 @@ echo PREPARE
./scripts/prepare ./scripts/prepare
echo PACKAGE echo PACKAGE
./scripts/package ./scripts/package
if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
export INTEGRATION_TESTS=1 if [[ "$INTEGRATION_TESTS" != "" ]]; then
echo INTEGRATION-TEST if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
./scripts/integration-test export INTEGRATION_TESTS=1
else
export INTEGRATION_TESTS=0
fi
fi
if [[ "$INTEGRATION_TESTS" != "1" ]]; then
echo INTEGRATION-TEST
./scripts/integration-test
else else
export INTEGRATION_TESTS=0 echo "Skipping integration tests"
echo "Skipping integration tests"
fi fi
if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then