summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2022-06-23 11:24:04 -0700
committerRiccardo Pittau <elfosardo@gmail.com>2022-06-27 14:39:18 +0000
commit60883e32cb17f073188e7e4f49705b900418c56f (patch)
tree46a0f52c4ce85e1e9c028c53ad355aee6e58c733
parentdee6b0c294b357a759c6cc54ccdc17835b2bd84f (diff)
downloadironic-60883e32cb17f073188e7e4f49705b900418c56f.tar.gz
CI: Add iweb to the use tinyipa on list
Change-Id: Ib1d415928a6555298d42e8d525f04eb1028a4bb8 (cherry picked from commit e0c758bb95f92081e54f3c8ed9fa95dcbe7d917e)
-rw-r--r--devstack/lib/ironic9
1 files changed, 6 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 8e0a3a45c..d381be652 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -165,12 +165,13 @@ if [[ -n "$BUILD_TIMEOUT" ]]; then
fi
hostdomain=$(hostname)
-if [[ "$hostdomain" =~ "rax" ]]; then
+if [[ "$hostdomain" =~ "rax" ]] || [[ "$hostdomain" =~ "iweb" ]]; then
echo "WARNING: Auto-increasing the requested build timeout by 1.5 as the detected hostname suggests a cloud host where VMs are software emulated."
# NOTE(TheJulia): Rax hosts are entirely qemu emulated, not CPU enabled
# virtualization. As such, the ramdisk decompression is known to take an
# eceptional amount of time and we need to afford a little more time to
# these hosts for jobs to complete without issues.
+ # NOTE(TheJulia): This is also the case for iweb hosts. And arm64 in general.
new_timeout=$(echo "$IRONIC_TEMPEST_BUILD_TIMEOUT * 1.5 / 1" | bc)
IRONIC_TEMPEST_BUILD_TIMEOUT=$new_timeout
@@ -277,10 +278,12 @@ if [[ ! "$IRONIC_RAMDISK_TYPE" =~ $IRONIC_SUPPORTED_RAMDISK_TYPES_RE ]]; then
die $LINENO "Unrecognized IRONIC_RAMDISK_TYPE: $IRONIC_RAMDISK_TYPE. Expected 'tinyipa' or 'dib'"
fi
+# NOTE(TheJulia): If we ever run any arm64, we will need to consider doing
+# the same. Nested virt is not a thing there.
# Prevent a case that will likely result in a failure.
-if [[ "$hostdomain" =~ "rax" ]]; then
+if [[ "$hostdomain" =~ "rax" ]] || [[ "$hostdomain" =~ "iweb" ]]; then
if [[ "$IRONIC_RAMDISK_TYPE" == "dib" ]]; then
- echo "** WARNING ** - DIB based IPA images have been defined, however we are running devstack on RAX VM. Due to virtualization constraints, we are automatically falling back to TinyIPA to ensure CI job passage."
+ echo "** WARNING ** - DIB based IPA images have been defined, however we are running devstack on an environment which does not support nested VMs. Due to virtualization constraints, we are automatically falling back to TinyIPA to ensure CI job passage."
IRONIC_RAMDISK_TYPE="tinyipa"
fi
fi