summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-19 20:37:41 +0200
committerGitHub <noreply@github.com>2020-08-19 20:37:41 +0200
commit9babd21dfc263b0a63fc96eec0de2a6d0d834ab5 (patch)
treed5f92c01f9ad6c45ae712d18a5c926f313a3b074
parent15073f444e1e65881bc84eeeb275a564f39fb51e (diff)
parenta1e0a78425f9834a60293a182110edd0fae08890 (diff)
downloadpodman-9babd21dfc263b0a63fc96eec0de2a6d0d834ab5.tar.gz
podman-9babd21dfc263b0a63fc96eec0de2a6d0d834ab5.tar.bz2
podman-9babd21dfc263b0a63fc96eec0de2a6d0d834ab5.zip
Merge pull request #7344 from cevich/increase_timeout
Cirrus: Increase integration-testing timeout
-rw-r--r--.cirrus.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 1458e2cc6..276623607 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -417,8 +417,6 @@ testing_task:
gce_instance:
image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
- timeout_in: 120m
-
env:
ADD_SECOND_PARTITION: 'true'
matrix:
@@ -473,8 +471,6 @@ special_testing_rootless_task:
- RCLI: 'true'
- RCLI: 'false'
- timeout_in: 60m
-
networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
@@ -515,8 +511,6 @@ special_testing_in_podman_task:
MOD_CONTAINERS_CONF: 'false' # Use existing/native setup
SPECIALMODE: 'in_podman' # See docs
- timeout_in: 60m
-
networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'