openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Use jinja for image build conditionals"

This commit is contained in:
Zuul 2021-09-07 20:59:38 +00:00 committed by Gerrit Code Review
parent cd3d2c4574 1bf01e4e0d
commit 09ea1b21d3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
roles/oooci-build-images/templates/build-images.sh.j2
View File

@ -20,19 +20,19 @@ export ELEMENTS_PATH=$ELEMENTS
{% endif %}
# the tripleo_image_type is set and passed from the ci job definition
if [ "{{ tripleo_image_type }}" == "overcloud-hardened-uefi-full" ]; then
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-uefi-python3.yaml \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-uefi-{{ tripleo_image_os }}.yaml"
elif [ "{{ tripleo_image_type }}" == "overcloud-hardened-full" ]; then
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/{{ hardened_image_config[python_v] }} \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-{{ tripleo_image_os }}.yaml"
else
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/{{ base_image_config[python_v] }} \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-images-{{ tripleo_image_os }}.yaml"
fi
{% if tripleo_image_type == "overcloud-hardened-uefi-full" %}
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-uefi-python3.yaml \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-uefi-{{ tripleo_image_os }}.yaml"
{% elif tripleo_image_type == "overcloud-hardened-full" %}
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/{{ hardened_image_config[python_v] }} \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-hardened-images-{{ tripleo_image_os }}.yaml"
{% else %}
CONFIG_FILES="--config-file \
{{ tripleo_common_path }}/image-yaml/{{ base_image_config[python_v] }} \
--config-file {{ tripleo_common_path }}/image-yaml/overcloud-images-{{ tripleo_image_os }}.yaml"
{% endif %}
{% if dib_local_image is defined %}