diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2018-07-03 11:33:20 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-07-03 11:34:15 -0700 |
| commit | c1b4c1ffee850aea2880f5f91a1e48e840933c71 (patch) | |
| tree | 9729eb5a2eea93103c65485adce4594dbf9b6117 /kokoro | |
| parent | 062a6f6ec5f4bf2ce46790a22d8e7278d51e6836 (diff) | |
Fix flaky image_test
- Some failures were being ignored in run_tests.sh
- Give more time for mysql to setup
- Fix typo with network=host tests
- Change httpd test to wait on http server being available, not only output
PiperOrigin-RevId: 203156896
Change-Id: Ie1801dcd76e9b5fe4722c4d8695c76e40988dd74
Diffstat (limited to 'kokoro')
| -rwxr-xr-x | kokoro/gcp_ubuntu/run_tests.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kokoro/gcp_ubuntu/run_tests.sh b/kokoro/gcp_ubuntu/run_tests.sh index 5554350da..978a21599 100755 --- a/kokoro/gcp_ubuntu/run_tests.sh +++ b/kokoro/gcp_ubuntu/run_tests.sh @@ -44,12 +44,15 @@ bazel test --test_output=errors //... exit_code=${?} if [[ ${exit_code} -eq 0 ]]; then - # image_test is tagged manual - bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime} //runsc/test/image:image_test - bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-kvm //runsc/test/image:image_test - bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-nethost //runsc/test/image:image_test - bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}-overlay //runsc/test/image:image_test - exit_code=${?} + declare -a variations=("" "-kvm" "-hostnet" "-overlay") + for v in "${variations[@]}"; do + # image_test is tagged manual + bazel test --test_output=errors --test_env=RUNSC_RUNTIME=${runtime}${v} //runsc/test/image:image_test + exit_code=${?} + if [[ ${exit_code} -ne 0 ]]; then + break + fi + done fi # Best effort to uninstall |