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

Commit 5e37bce

Browse files
committed
Remove integration tests
1 parent f8113a7 commit 5e37bce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3
-2462
lines changed

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
4040

4141
########## Dapper Configuration #####################
4242

43-
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR INTEGRATION_TESTS
43+
ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR
4444
ENV DAPPER_DOCKER_SOCKET true
4545
ENV DAPPER_SOURCE /go/src/github.com/rancher/os
4646
ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel

Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ release-build:
4343
mkdir -p dist
4444
./.dapper release 2>&1 | tee dist/release.log
4545

46-
itest:
47-
mkdir -p dist
48-
./.dapper integration-test 2>&1 | tee dist/itest.log
49-
grep --binary-files=text FAIL dist/itest.log || true
50-
5146
qcows:
5247
cp dist/artifacts/rancheros.iso scripts/images/openstack/
5348
cd scripts/images/openstack && \
@@ -66,7 +61,7 @@ rpi64:
6661

6762
vmware: .dapper
6863
mkdir -p dist
69-
INTEGRATION_TESTS=0 ./.dapper vmware-release 2>&1 | tee dist/release.log
64+
./.dapper vmware-release 2>&1 | tee dist/release.log
7065

7166
help:
7267
@./scripts/help

scripts/ci

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,3 @@ echo TEST
99
./scripts/test
1010
echo VALIDATE
1111
./scripts/validate
12-
13-
# Drone servers kernel too old, and the integration tests often time out
14-
#echo PREPARE
15-
#./scripts/prepare
16-
#echo PACKAGE
17-
#./scripts/package
18-
#echo INTEGRATION-TEST
19-
#./scripts/integration-test
20-

scripts/integration-test

Lines changed: 0 additions & 21 deletions
This file was deleted.

scripts/release

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ echo PREPARE
1717
echo PACKAGE
1818
./scripts/package
1919

20-
if [[ "$INTEGRATION_TESTS" != "" ]]; then
21-
if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
22-
export INTEGRATION_TESTS=1
23-
else
24-
export INTEGRATION_TESTS=0
25-
fi
26-
fi
27-
if [[ "$INTEGRATION_TESTS" != "1" ]]; then
28-
echo INTEGRATION-TEST
29-
./scripts/integration-test
30-
else
31-
echo "Skipping integration tests"
32-
fi
33-
3420
#if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then
3521
## make generated changelog
3622
#lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n')

scripts/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cd $(dirname $0)/..
66

77
echo Running tests
88

9-
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!$!/...!')"
9+
PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
1010

1111
if [ "$ARCH" = "amd64" ]; then
1212
RACE="-race"

tests/assets/cloud_config_install_test/cloud-config.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

tests/assets/multi_nic/cloud-config.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/assets/pre_cmds/cloud-config.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

tests/assets/test_01/cloud-config.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)