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

Commit

Permalink
Remove integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
niusmallnan committed Feb 11, 2019
1 parent f8113a7 commit 5e37bce
Show file tree
Hide file tree
Showing 69 changed files with 3 additions and 2,462 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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 INTEGRATION_TESTS
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR
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
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ release-build:
mkdir -p dist
./.dapper release 2>&1 | tee dist/release.log

itest:
mkdir -p dist
./.dapper integration-test 2>&1 | tee dist/itest.log
grep --binary-files=text FAIL dist/itest.log || true

qcows:
cp dist/artifacts/rancheros.iso scripts/images/openstack/
cd scripts/images/openstack && \
Expand All @@ -66,7 +61,7 @@ rpi64:

vmware: .dapper
mkdir -p dist
INTEGRATION_TESTS=0 ./.dapper vmware-release 2>&1 | tee dist/release.log
./.dapper vmware-release 2>&1 | tee dist/release.log

help:
@./scripts/help
Expand Down
9 changes: 0 additions & 9 deletions scripts/ci
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,3 @@ echo TEST
./scripts/test
echo VALIDATE
./scripts/validate

# Drone servers kernel too old, and the integration tests often time out
#echo PREPARE
#./scripts/prepare
#echo PACKAGE
#./scripts/package
#echo INTEGRATION-TEST
#./scripts/integration-test

21 changes: 0 additions & 21 deletions scripts/integration-test

This file was deleted.

14 changes: 0 additions & 14 deletions scripts/release
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ echo PREPARE
echo PACKAGE
./scripts/package

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
echo "Skipping integration tests"
fi

#if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
## make generated changelog
#lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n')
Expand Down
2 changes: 1 addition & 1 deletion scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd $(dirname $0)/..

echo Running tests

PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin|tests)' | sed -e 's!^!./!' -e 's!$!/...!')"
PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"

if [ "$ARCH" = "amd64" ]; then
RACE="-race"
Expand Down
27 changes: 0 additions & 27 deletions tests/assets/cloud_config_install_test/cloud-config.yml

This file was deleted.

19 changes: 0 additions & 19 deletions tests/assets/multi_nic/cloud-config.yml

This file was deleted.

47 changes: 0 additions & 47 deletions tests/assets/pre_cmds/cloud-config.yml

This file was deleted.

15 changes: 0 additions & 15 deletions tests/assets/test_01/cloud-config.yml

This file was deleted.

102 changes: 0 additions & 102 deletions tests/assets/test_02/cloud-config.yml

This file was deleted.

5 changes: 0 additions & 5 deletions tests/assets/test_03/cloud-config.yml

This file was deleted.

6 changes: 0 additions & 6 deletions tests/assets/test_05/cloud-config.yml

This file was deleted.

32 changes: 0 additions & 32 deletions tests/assets/test_09/cloud-config.yml

This file was deleted.

5 changes: 0 additions & 5 deletions tests/assets/test_10/cloud-config.yml

This file was deleted.

18 changes: 0 additions & 18 deletions tests/assets/test_11/cloud-config.yml

This file was deleted.

18 changes: 0 additions & 18 deletions tests/assets/test_11/cloud-config_arm.yml

This file was deleted.

Loading

0 comments on commit 5e37bce

Please sign in to comment.