diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-25 18:21:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-25 18:21:25 +0000 |
| commit | 293409783074be102753f518889ef06094de24f0 (patch) | |
| tree | c6f8873be68bed880654b6b0081ecf82ab471e27 | |
| parent | f4a4ad25c84a48117380505c5d3a533d2a7c88b5 (diff) | |
| parent | 030b4309e44c1c6ec7d85af57a67ca43b5d521a3 (diff) | |
| download | ironic-293409783074be102753f518889ef06094de24f0.tar.gz | |
Merge "CI: Add iweb to the use tinyipa on list" into stable/victoria
| -rw-r--r-- | devstack/lib/ironic | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 5da2c8a51..ace1beda3 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 @@ -263,10 +264,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 |