diff --git a/.cirrus.yml b/.cirrus.yml index 370c9a12d819..f4efb1a797b2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -610,7 +610,7 @@ local_integration_test_task: &local_integration_test_task gce_instance: &fastvm <<: *standardvm cpu: 4 - timeout_in: 50m + timeout_in: 30m env: TEST_FLAVOR: int clone_script: *get_gosrc @@ -657,7 +657,7 @@ container_integration_test_task: CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CI_DESIRED_DATABASE: boltdb gce_instance: *fastvm - timeout_in: 50m + timeout_in: 30m env: TEST_FLAVOR: int TEST_ENVIRON: container @@ -677,7 +677,7 @@ rootless_integration_test_task: depends_on: *build matrix: *platform_axis gce_instance: *fastvm - timeout_in: 50m + timeout_in: 30m env: TEST_FLAVOR: int PRIV_NAME: rootless diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 62366e95a0cc..09ada7996bc7 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -56,14 +56,10 @@ function _run_compose_v2() { } function _run_int() { - _bail_if_test_can_be_skipped test/e2e - dotest integration } function _run_sys() { - _bail_if_test_can_be_skipped test/system - dotest system } @@ -74,8 +70,6 @@ function _run_upgrade_test() { } function _run_bud() { - _bail_if_test_can_be_skipped test/buildah-bud - showrun ./test/buildah-bud/run-buildah-bud-tests |& logformatter } @@ -433,8 +427,6 @@ dotest() { } _run_machine-linux() { - _bail_if_test_can_be_skipped pkg/machine/e2e - showrun make localmachine |& logformatter }