Merge "[magnum] Increase DIB_IMAGE_SIZE to 2.5"

This commit is contained in:
Jenkins 2017-01-18 08:50:40 +00:00 committed by Gerrit Code Review
commit 1d7257b8f4

View File

@ -109,8 +109,6 @@
DIB_ELEMENTS=./openstack/diskimage-builder/elements
export DIB_IMAGE_SIZE=2.2
if [ "{image-name}" == "ubuntu-mesos" ]; then
TRIPLEO_ELEMENTS=./openstack/tripleo-image-elements/elements
HEAT_ELEMENTS=./openstack/heat-templates/hot/software-config/elements
@ -121,6 +119,8 @@
export DIB_RELEASE=trusty
export DIB_IMAGE_SIZE=2.2
disk-image-create ubuntu vm docker mesos \
os-collect-config os-refresh-config os-apply-config \
heat-config heat-config-script -o $WORKSPACE/{image-name}.qcow2
@ -133,6 +133,8 @@
export DIB_RELEASE="25"
export DIB_IMAGE_SIZE=2.5
export FEDORA_ATOMIC_TREE_URL="https://kojipkgs.fedoraproject.org/atomic/25/"
export FEDORA_ATOMIC_TREE_REF="8b15e9b988b4b02f4cb8b39bdd63d182ab7004a8926ecdac6314ee5c7ffa646b"