diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-30 19:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-30 19:19:20 +0000 |
| commit | 09e246294bbe6f69dc3a0f2dd7603bcc3b43864a (patch) | |
| tree | b5414ffc9a692fea7727b95f9dacc48e9d9b5388 /devstack | |
| parent | af0e029a9f98ac50c07e6fcf1652d89a829ce512 (diff) | |
| parent | 87e634dee1dfaec80b428cad459d174d65ce1b68 (diff) | |
| download | ironic-09e246294bbe6f69dc3a0f2dd7603bcc3b43864a.tar.gz | |
Merge "CI: increase cleaning timeout and tie it to PXE boot timeout"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 6737586fa..299a86d09 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -97,7 +97,7 @@ IRONIC_CALLBACK_TIMEOUT=${IRONIC_CALLBACK_TIMEOUT:-} # Timeout before retrying PXE boot. Set low to help the CI. if [[ "$IRONIC_IS_HARDWARE" == False ]]; then - IRONIC_PXE_BOOT_RETRY_TIMEOUT=${IRONIC_PXE_BOOT_RETRY_TIMEOUT:-600} + IRONIC_PXE_BOOT_RETRY_TIMEOUT=${IRONIC_PXE_BOOT_RETRY_TIMEOUT:-900} else IRONIC_PXE_BOOT_RETRY_TIMEOUT=${IRONIC_PXE_BOOT_RETRY_TIMEOUT:-} fi @@ -665,9 +665,13 @@ fi # Timeout for "manage" action. 2 minutes is more than enough. IRONIC_MANAGE_TIMEOUT=${IRONIC_MANAGE_TIMEOUT:-120} -# Timeout for "provide" action. This involves cleaning. Generally, 15 minutes -# should be enough, but real hardware may need more. -IRONIC_CLEANING_TIMEOUT=${IRONIC_CLEANING_TIMEOUT:-1200} +# Timeout for "provide" action. This involves cleaning. +if [[ -n "$IRONIC_PXE_BOOT_RETRY_TIMEOUT" ]]; then + IRONIC_DEFAULT_CLEANING_TIMEOUT=$(( $IRONIC_PXE_BOOT_RETRY_TIMEOUT * 2 )) +else + IRONIC_DEFAULT_CLEANING_TIMEOUT=1800 +fi +IRONIC_CLEANING_TIMEOUT=${IRONIC_CLEANING_TIMEOUT:-$IRONIC_DEFAULT_CLEANING_TIMEOUT} IRONIC_CLEANING_DELAY=10 IRONIC_CLEANING_ATTEMPTS=$(( $IRONIC_CLEANING_TIMEOUT / $IRONIC_CLEANING_DELAY )) |