Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/github/codeql-acti…
Browse files Browse the repository at this point in the history
…on-3.25.14
  • Loading branch information
claudiol committed Jul 29, 2024
2 parents c7ef854 + a849288 commit 665c2fe
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/extra-docs-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 11 additions & 0 deletions roles/builder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 665c2fe

Please sign in to comment.