diff --git a/.github/workflows/extra-docs-linting.yml b/.github/workflows/extra-docs-linting.yml index f314dbff..e5d72dc3 100644 --- a/.github/workflows/extra-docs-linting.yml +++ b/.github/workflows/extra-docs-linting.yml @@ -30,6 +30,9 @@ jobs: with: python-version: "3.10" + - name: Install antsibull-docs + run: ansible-galaxy collection install fedora.linux_system_roles + - name: Install antsibull-docs run: pip install antsibull-docs --disable-pip-version-check diff --git a/roles/builder/tasks/main.yml b/roles/builder/tasks/main.yml index 346811ac..936e6377 100644 --- a/roles/builder/tasks/main.yml +++ b/roles/builder/tasks/main.yml @@ -248,11 +248,22 @@ - builder_compose_type is defined - "'installer' in builder_compose_type or 'raw' in builder_compose_type" block: + - name: Create __edge_insaller_customizations var + ansible.builtin.set_fact: + __edge_insaller_customizations: {} + + - name: Set _edge_insaller_customizations value including only fdo and installation_device customizations + ansible.builtin.set_fact: + __edge_insaller_customizations: "{{ __edge_insaller_customizations | combine({item.key: item.value}) }}" + when: "item.key in ['fips']" + with_dict: "{{ builder_compose_customizations }}" + - name: Create blank blueprint infra.osbuild.create_blueprint: # noqa only-builtins dest: "{{ builder_blueprint_src_path }}" name: "{{ builder_blueprint_name }}-empty" distro: "{{ builder_blueprint_distro | default(omit) }}" + customizations: "{{ __edge_insaller_customizations }}" register: __builder_blueprint_output # noqa var-naming[no-role-prefix] when: - "'simplified' not in builder_compose_type and 'edge' in builder_compose_type or 'iot' in builder_compose_type"