Skip to content

Commit f6fae49

Browse files
committed
Fix migration tests.
Need to build driver before installing kubetest2.
1 parent 06555b9 commit f6fae49

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/run-k8s-windows-migration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
2222
readonly feature_gates="CSIMigration=true,CSIMigrationGCE=true,ExpandCSIVolumes=true"
2323
readonly use_kubetest2=${USE_KUBETEST2:-true}
2424

25+
make -C "${PKGDIR}" test-k8s-integration
26+
2527
if [ "$use_kubetest2" = true ]; then
2628
export GO111MODULE=on;
2729
go get sigs.k8s.io/kubetest2@latest;
@@ -34,8 +36,6 @@ readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-st
3436

3537
# TODO(#167): Enable reconstructions tests
3638

37-
make -C "${PKGDIR}" test-k8s-integration
38-
3939
${PKGDIR}/bin/k8s-integration-test \
4040
--platform=windows --bringup-cluster=false --teardown-cluster=false \
4141
--run-in-prow=true \

test/run-windows-k8s-integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
1818
readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
1919
readonly use_kubetest2=${USE_KUBETEST2:-true}
2020

21+
make -C "${PKGDIR}" test-k8s-integration
22+
2123
if [ "$use_kubetest2" = true ]; then
2224
export GO111MODULE=on;
2325
go get sigs.k8s.io/kubetest2@latest;
@@ -26,8 +28,6 @@ if [ "$use_kubetest2" = true ]; then
2628
go get sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
2729
fi
2830

29-
make -C "${PKGDIR}" test-k8s-integration
30-
3131
base_cmd="${PKGDIR}/bin/k8s-integration-test \
3232
--platform=windows --bringup-cluster=false --teardown-cluster=false --teardown-driver=${teardown_driver}\
3333
--run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \

0 commit comments

Comments
 (0)