summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 3fcf335ed..5087a00eb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -418,10 +418,14 @@ unit_test_task:
apiv2_test_task:
name: "APIv2 test on $DISTRO_NV"
alias: apiv2_test
+ only_if: *not_docs
skip: *tags
depends_on:
- validate
gce_instance: *standardvm
+ # Test is normally pretty quick, about 10-minutes. If it hangs,
+ # don't make developers wait the full 1-hour timeout.
+ timeout_in: 20m
env:
<<: *stdenvars
TEST_FLAVOR: apiv2
@@ -643,6 +647,8 @@ upgrade_test_task:
PODMAN_UPGRADE_FROM: v2.0.6
- env:
PODMAN_UPGRADE_FROM: v2.1.1
+ - env:
+ PODMAN_UPGRADE_FROM: v3.1.2
gce_instance: *standardvm
env:
TEST_FLAVOR: upgrade_test