Merge pull request #2563 from bskiba/fix-e2e

Run VPA e2e tests from the e2e dir
kubernetes · Nov 26, 2019 · 007c99c · 007c99c
2 parents 4bb9b94 + 537c7b3
commit 007c99c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/vertical-pod-autoscaler/hack/run-e2e-tests.sh b/vertical-pod-autoscaler/hack/run-e2e-tests.sh
@@ -47,9 +47,11 @@ export GO111MODULE=on
 case ${SUITE} in
   recommender|updater|admission-controller|actuation|full-vpa)
     export KUBECONFIG=$HOME/.kube/config
-    go test -mod vendor ${SCRIPT_ROOT}/e2e/v1beta2/*go -v -test.timeout=60m  --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump
+    pushd ${SCRIPT_ROOT}/e2e
+    go test -mod vendor ./v1beta2/*go -v -test.timeout=60m  --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump
     FIRST_RESULT=$?
-    go test -mod vendor ${SCRIPT_ROOT}/e2e/v1/*go -v -test.timeout=60m  --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump
+    go test -mod vendor ./v1/*go -v -test.timeout=60m  --args --ginkgo.v=true --ginkgo.focus="\[VPA\] \[${SUITE}\]" --report-dir=/workspace/_artifacts --disable-log-dump
+    popd
     echo First test result: ${FIRST_RESULT}
     if [ $FIRST_RESULT -gt 0 ]; then
       echo "Please check first \"go test\" logs!"