Skip to content

Commit 219e9c2

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Build an image for heat functional tests"
2 parents 276b158 + 2a6009c commit 219e9c2

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

lib/heat

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,23 @@ function create_heat_accounts {
279279
fi
280280
}
281281

282+
# build_heat_functional_test_image() - Build and upload functional test image
283+
function build_heat_functional_test_image {
284+
build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
285+
local image_name=heat-functional-tests-image
286+
287+
# The elements to invoke disk-image-create with
288+
local image_elements="vm fedora selinux-permissive pypi \
289+
os-collect-config os-refresh-config os-apply-config heat-cfntools \
290+
heat-config heat-config-cfn-init heat-config-puppet heat-config-script"
291+
292+
# Elements path for tripleo-image-elements and heat-templates software-config
293+
local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements
294+
295+
disk_image_create_upload "$image_name" "$image_elements" "$elements_path"
296+
iniset $TEMPEST_CONFIG orchestration image_ref $image_name
297+
}
298+
282299
# Restore xtrace
283300
$XTRACE
284301

stack.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,10 @@ if is_service_enabled heat; then
12721272
init_heat
12731273
echo_summary "Starting Heat"
12741274
start_heat
1275+
if [ "$HEAT_CREATE_TEST_IMAGE" = "True" ]; then
1276+
echo_summary "Building Heat functional test image"
1277+
build_heat_functional_test_image
1278+
fi
12751279
fi
12761280

12771281

0 commit comments

Comments
 (0)