@@ -279,6 +279,23 @@ function create_heat_accounts {

     fi

 }

+# build_heat_functional_test_image() - Build and upload functional test image

+function build_heat_functional_test_image {

+    build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"

+    local image_name=heat-functional-tests-image

+

+    # The elements to invoke disk-image-create with

+    local image_elements="vm fedora selinux-permissive pypi \

+        os-collect-config os-refresh-config os-apply-config heat-cfntools \

+        heat-config heat-config-cfn-init heat-config-puppet heat-config-script"

+

+    # Elements path for tripleo-image-elements and heat-templates software-config

+    local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements

+

+    disk_image_create_upload "$image_name" "$image_elements" "$elements_path"

+    iniset $TEMPEST_CONFIG orchestration image_ref $image_name

+}

+

 # Restore xtrace

 $XTRACE

@@ -1272,6 +1272,10 @@ if is_service_enabled heat; then

     init_heat

     echo_summary "Starting Heat"

     start_heat

+    if [ "$HEAT_CREATE_TEST_IMAGE" = "True" ]; then

+        echo_summary "Building Heat functional test image"

+        build_heat_functional_test_image

+    fi

 fi