diff --git a/roles/tripleo_container_image_build/README.md b/roles/tripleo_container_image_build/README.md index 7a82519..d8fcf2f 100644 --- a/roles/tripleo_container_image_build/README.md +++ b/roles/tripleo_container_image_build/README.md @@ -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_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_tcib_extras`: (List) TCIB extra variables (Like tcib_release, tcib_python_version). Default: None Output Variables ---------------- diff --git a/roles/tripleo_container_image_build/defaults/main.yml b/roles/tripleo_container_image_build/defaults/main.yml index ac10d52..af2b431 100644 --- a/roles/tripleo_container_image_build/defaults/main.yml +++ b/roles/tripleo_container_image_build/defaults/main.yml @@ -27,3 +27,4 @@ tripleo_container_image_build_timeout: 5700 tripleo_container_image_build_volumes: [] tripleo_container_image_build_work_dir: tripleo_container_image_build_retries: 0 +tripleo_container_image_build_tcib_extras: [] diff --git a/roles/tripleo_container_image_build/molecule/default/converge.yml b/roles/tripleo_container_image_build/molecule/default/converge.yml index cf2a32c..adbbe05 100644 --- a/roles/tripleo_container_image_build/molecule/default/converge.yml +++ b/roles/tripleo_container_image_build/molecule/default/converge.yml @@ -226,3 +226,17 @@ that: - tripleo_container_image_build_output == "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" diff --git a/roles/tripleo_container_image_build/tasks/main.yml b/roles/tripleo_container_image_build/tasks/main.yml index 2c2c995..301e671 100644 --- a/roles/tripleo_container_image_build/tasks/main.yml +++ b/roles/tripleo_container_image_build/tasks/main.yml @@ -23,6 +23,7 @@ {{ 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_combine | ternary("2>&1", '') }} + {{ tripleo_container_image_build_tcib_extras | tripleo.operator.shell_arg_list('--tcib-extras') }} _build_env: {} - name: Preserve existing log file if exists