summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2018-02-09 09:29:31 +0100
committerDmitry Tantsur <divius.inside@gmail.com>2018-02-09 09:29:31 +0100
commitb7ad0e61aa5a76619aab541036af474fdfc6f887 (patch)
treedb626222def1178322a69b063206983585182d9a
parent6ab2908f829f39f6fb438a7bae9b671abfa97588 (diff)
downloadironic-b7ad0e61aa5a76619aab541036af474fdfc6f887.tar.gz
Prepare testing for stable/queens
* Use ironic-python-agent stable/queens * Cap API microversion at 1.38 Change-Id: I3d2b7c1732f3421fc7382963fffdc71b88f9b004
-rw-r--r--devstack/lib/ironic4
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index be782bbbe..0b192dbc3 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -219,7 +219,7 @@ IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-$TOP_DIR/files/ir-deploy-$IRONIC_DE
IRONIC_DEPLOY_ISO=${IRONIC_DEPLOY_ISO:-$TOP_DIR/files/ir-deploy-$IRONIC_DEPLOY_DRIVER.iso}
# NOTE(jroll) this needs to be updated when stable branches are cut
-IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-master}
+IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-stable/queens}
IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -)
# Configure URLs required to download ramdisk if we're not building it, and
@@ -428,7 +428,7 @@ IRONIC_DEPLOY_LOGS_LOCAL_PATH=${IRONIC_DEPLOY_LOGS_LOCAL_PATH:-$IRONIC_VM_LOG_DI
TEMPEST_BAREMETAL_MIN_MICROVERSION=${TEMPEST_BAREMETAL_MIN_MICROVERSION:-}
# Define baremetal max_microversion in tempest config. No default value means that it is picked from tempest.
-TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-}
+TEMPEST_BAREMETAL_MAX_MICROVERSION=${TEMPEST_BAREMETAL_MAX_MICROVERSION:-'1.38'}
# get_pxe_boot_file() - Get the PXE/iPXE boot file path
function get_pxe_boot_file {