openstack/tripleo-operator-ansible
Code Issues Proposed changes

Merge "Added support for tcib_extras in container build"

Browse Source
This commit is contained in:
Zuul
2021-09-27 19:09:53 +00:00
committed by Gerrit Code Review
parent 8b72a414d6 3e07830f08
commit 8f42bea9b0
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_container_image_build/README.md
View File

@@ -35,6 +35,7 @@ Role Variables
* `tripleo_container_image_build_timeout`: (Integer) Number in seconds to wait for the ansible execution of the build command to finish. Default: 5700 * `tripleo_container_image_build_timeout`: (Integer) Number in seconds to wait for the ansible execution of the build command to finish. Default: 5700
* `tripleo_container_image_build_volumes`: (List) Volume to bind mount during the container image builds. Default: [] * `tripleo_container_image_build_volumes`: (List) Volume to bind mount during the container image builds. Default: []
* `tripleo_container_image_build_work_dir`: (String) Tripleo container builds directory. * `tripleo_container_image_build_work_dir`: (String) Tripleo container builds directory.
* `tripleo_container_image_build_tcib_extras`: (List) TCIB extra variables (Like tcib_release, tcib_python_version). Default: None
Output Variables Output Variables
---------------- ----------------

1
roles/tripleo_container_image_build/defaults/main.yml
View File

@@ -27,3 +27,4 @@ tripleo_container_image_build_timeout: 5700
tripleo_container_image_build_volumes: [] tripleo_container_image_build_volumes: []
tripleo_container_image_build_work_dir: tripleo_container_image_build_work_dir:
tripleo_container_image_build_retries: 0 tripleo_container_image_build_retries: 0
tripleo_container_image_build_tcib_extras: []

14
roles/tripleo_container_image_build/molecule/default/converge.yml
View File

@@ -226,3 +226,17 @@
that: that:
- tripleo_container_image_build_output == - tripleo_container_image_build_output ==
"tripleo container image build --work-dir /work" "tripleo container image build --work-dir /work"
- name: Check parameter "tripleo_container_image_build_tcib_extras"
include_role:
name: "tripleo_container_image_build"
vars:
tripleo_container_image_build_tcib_extras:
- tcib_release=8
- tcib_python_version=3.9
- name: Assert "tripleo_container_image_build_tcib_extras"
assert:
that:
- tripleo_container_image_build_output ==
"tripleo container image build --tcib-extras tcib_release=8 --tcib-extras tcib_python_version=3.9"

1
roles/tripleo_container_image_build/tasks/main.yml
View File

@@ -23,6 +23,7 @@
{{ tripleo_container_image_build_work_dir | ternary('--work-dir ' ~ tripleo_container_image_build_work_dir, '') }} {{ tripleo_container_image_build_work_dir | ternary('--work-dir ' ~ tripleo_container_image_build_work_dir, '') }}
{{ tripleo_container_image_build_log_output | ternary((">" ~ tripleo_container_image_build_log), '') }} {{ tripleo_container_image_build_log_output | ternary((">" ~ tripleo_container_image_build_log), '') }}
{{ tripleo_container_image_build_log_combine | ternary("2>&1", '') }} {{ tripleo_container_image_build_log_combine | ternary("2>&1", '') }}
{{ tripleo_container_image_build_tcib_extras | tripleo.operator.shell_arg_list('--tcib-extras') }}
_build_env: {} _build_env: {}
- name: Preserve existing log file if exists - name: Preserve existing log file if exists