diff --git a/ci-fini.sh b/ci-fini.sh index d6b9454..7e1c762 100755 --- a/ci-fini.sh +++ b/ci-fini.sh @@ -8,11 +8,11 @@ export KUBECONFIG=$HOME/admin.conf \ TEST_SCRATCH_DEVICE=/dev/sdb \ KUBE_VERSION=v1.18.3 -tests/scripts/helm.sh clean -tests/scripts/kubeadm.sh clean sudo rm -rf /var/lib/etcd sudo rm -rf /etc/kubernetes sudo rm -rf /var/lib/rook +tests/scripts/helm.sh clean +tests/scripts/kubeadm.sh clean sudo vgremove --yes --force rook-integration-test-vg sudo pvremove --yes --force ${test_scratch_device} sudo dd if=/dev/zero of=/dev/sdb bs=1M count=100 oflag=dsync,direct diff --git a/ci-init.sh b/ci-init.sh index 7af4b43..06a7b5f 100755 --- a/ci-init.sh +++ b/ci-init.sh @@ -1,7 +1,7 @@ #!/bin/bash export KUBECONFIG=$HOME/admin.conf \ - KUBE_VERSION=v1.18.3 + KUBE_VERSION=v1.18.6 tests/scripts/kubeadm.sh up tests/scripts/helm.sh up @@ -12,5 +12,8 @@ export PATH="/tmp/rook-tests-scripts-helm/linux-amd64:$PATH" \ STORAGE_PROVIDER_TESTS=ceph \ TEST_IS_OFFICIAL_BUILD=false \ TEST_SCRATCH_DEVICE=/dev/sdb -_output/tests/linux_amd64/integration -test.v -test.timeout 7200s -test.run 'MultiClusterDeploySuite' 2>&1 | tee _output/tests/integrationTests.log -#_output/tests/linux_amd64/integration -test.v -test.timeout 7200s 2>&1 | tee _output/tests/integrationTests.log + +go test -v -timeout 1800s github.com/rook/rook/tests/integration +#go test -v -timeout 1800s -run CephSmokeSuite github.com/rook/rook/tests/integration +#go test -v -timeout 1800s -run CephSmokeSuite github.com/rook/rook/tests/integration -testify.m TestRookClusterInstallation_SmokeTest + diff --git a/own-cluster-init.sh b/own-cluster-init.sh index b2160d7..2f6e3cd 100755 --- a/own-cluster-init.sh +++ b/own-cluster-init.sh @@ -1,6 +1,6 @@ #!/bin/bash export KUBECONFIG=$HOME/admin.conf \ - KUBE_VERSION=v1.18.3 + KUBE_VERSION=v1.18.6 tests/scripts/kubeadm.sh up