openstack/ironic
Code Issues Proposed changes

Merge "CI: migrate UEFI jobs to Cirros 0.5.1"

Browse Source
This commit is contained in:
Zuul 2020-04-30 16:06:33 +00:00 committed by Gerrit Code Review
commit 1775a09fa1
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
devstack/common_settings
View File

@ -4,20 +4,19 @@ if [[ -f $TOP_DIR/../../old/devstack/.localrc.auto ]]; then
source <(cat $TOP_DIR/../../old/devstack/.localrc.auto | grep -v 'enable_plugin') source <(cat $TOP_DIR/../../old/devstack/.localrc.auto | grep -v 'enable_plugin')
fi fi
CIRROS_VERSION=0.4.0
# Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted
# values are: "bios" or "uefi", defaults to "bios". # values are: "bios" or "uefi", defaults to "bios".
#
# WARNING: UEFI is EXPERIMENTAL. The CirrOS images uploaded by DevStack by
# default WILL NOT WORK with UEFI.
IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios} IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios}
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec # TODO(dtantsur): migrate all jobs to 0.5.1
if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
IRONIC_DEFAULT_IMAGE_NAME=cirros-d160722-x86_64-uec CIRROS_VERSION=0.5.1
else
CIRROS_VERSION=0.4.0
fi fi
IRONIC_DEFAULT_IMAGE_NAME=cirros-${CIRROS_VERSION}-x86_64-uec
IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME} IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME}
# Add link to download queue, ignore if already exist. # Add link to download queue, ignore if already exist.
@ -33,17 +32,12 @@ function add_image_link {
fi fi
} }
if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then # NOTE (vsaienko) We are going to test mixed drivers/partitions in single setup.
add_image_link http://download.cirros-cloud.net/daily/20160722/cirros-d160722-x86_64-uec.tar.gz # Do not restrict downloading image only for specific case. Download both disk and uec images.
add_image_link http://download.cirros-cloud.net/daily/20160722/cirros-d160722-x86_64-disk.img # NOTE (vdrok): Here the images are actually pre-cached by devstack, in
else # the files folder, so they won't be downloaded again.
# NOTE (vsaienko) We are going to test mixed drivers/partitions in single setup. add_image_link http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz
# Do not restrict downloading image only for specific case. Download both disk and uec images. add_image_link http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img
# NOTE (vdrok): Here the images are actually pre-cached by devstack, in
# the files folder, so they won't be downloaded again.
add_image_link http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz
add_image_link http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img
fi
export IRONIC_WHOLEDISK_IMAGE_NAME=${IRONIC_WHOLEDISK_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-uec/-disk}} export IRONIC_WHOLEDISK_IMAGE_NAME=${IRONIC_WHOLEDISK_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-uec/-disk}}
export IRONIC_PARTITIONED_IMAGE_NAME=${IRONIC_PARTITIONED_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-disk/-uec}} export IRONIC_PARTITIONED_IMAGE_NAME=${IRONIC_PARTITIONED_IMAGE_NAME:-${IRONIC_IMAGE_NAME/-disk/-uec}}