Re: [PATCH v1 2/2] bootlinux: Fold bootlinux-local into the bootlinux role

[Daniel Gomez <da.gomez@kernel.org>]

On 18/05/2025 16.18, cel@kernel.org wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> Rather than running a separate play, adopt the more common mechanism
> for running a local action.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>   playbooks/bootlinux-local.yml                 |  5 -----
>   .../roles/bootlinux-local/defaults/main.yml   |  3 ---
>   .../roles/bootlinux-local/tasks/install-deps  |  1 -
>   .../roles/bootlinux-local/tasks/main.yml      | 19 ----------------
>   playbooks/roles/bootlinux/tasks/main.yml      | 22 ++++++++++++++++---
>   workflows/linux/Makefile                      |  3 ---
>   6 files changed, 19 insertions(+), 34 deletions(-)
>   delete mode 100644 playbooks/bootlinux-local.yml
>   delete mode 100644 playbooks/roles/bootlinux-local/defaults/main.yml
>   delete mode 120000 playbooks/roles/bootlinux-local/tasks/install-deps
>   delete mode 100644 playbooks/roles/bootlinux-local/tasks/main.yml
> 
> diff --git a/playbooks/bootlinux-local.yml b/playbooks/bootlinux-local.yml
> deleted file mode 100644
> index e342f0e56fb1..000000000000
> --- a/playbooks/bootlinux-local.yml
> +++ /dev/null
> @@ -1,5 +0,0 @@
> ----
> -- hosts: localhost
> -  connection: local
> -  roles:
> -    - role: bootlinux-local
> diff --git a/playbooks/roles/bootlinux-local/defaults/main.yml b/playbooks/roles/bootlinux-local/defaults/main.yml
> deleted file mode 100644
> index d7c41f4c3e90..000000000000
> --- a/playbooks/roles/bootlinux-local/defaults/main.yml
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# SPDX-License-Identifier copyleft-next-0.3.1
> ----
> -bootlinux_9p: False
> diff --git a/playbooks/roles/bootlinux-local/tasks/install-deps b/playbooks/roles/bootlinux-local/tasks/install-deps
> deleted file mode 120000
> index 492aaaa0174a..000000000000
> --- a/playbooks/roles/bootlinux-local/tasks/install-deps
> +++ /dev/null
> @@ -1 +0,0 @@
> -../../bootlinux/tasks/install-deps/
> \ No newline at end of file
> diff --git a/playbooks/roles/bootlinux-local/tasks/main.yml b/playbooks/roles/bootlinux-local/tasks/main.yml
> deleted file mode 100644
> index 367b3af46ec6..000000000000
> --- a/playbooks/roles/bootlinux-local/tasks/main.yml
> +++ /dev/null
> @@ -1,19 +0,0 @@
> ----
> -- name: Import optional extra_args file
> -  include_vars: "{{ item }}"
> -  ignore_errors: yes
> -  with_first_found:
> -    - files:
> -      - "../extra_vars.yml"
> -      - "../extra_vars.yaml"
> -      - "../extra_vars.json"
> -      skip: true
> -  tags: vars
> -
> -- name: Install dependencies to build Linux on host
> -  tags: [ 'deps' ]
> -  run_once: true
> -  local_action: import_tasks install-deps/main.yml
> -  when:
> -    - bootlinux_9p|bool
> -
> diff --git a/playbooks/roles/bootlinux/tasks/main.yml b/playbooks/roles/bootlinux/tasks/main.yml
> index 9ad675b3f278..3741b16aa33c 100644
> --- a/playbooks/roles/bootlinux/tasks/main.yml
> +++ b/playbooks/roles/bootlinux/tasks/main.yml
> @@ -10,11 +10,23 @@
>         skip: true
>     tags: vars
>   
> -# Distro specific
> -- name: Install dependencies
> -  include_tasks:
> +- name: Install dependencies to build and install the Linux kernel
> +  ansible.builtin.include_tasks:
>       file: install-deps/main.yml
>   

Same comment as in the other patch. Either we are missing deps tags 
here, at the Makefile target and at task level (and replace it with the 
current linux tag) or just remove all of them.

> +# Needs root on the controller
> +#
> +# Someday this should be done only once when installing kdevops
> +# on the Ansible control node.
> +- name: Install dependencies to build the Linux kernel
> +  run_once: true
> +  ansible.builtin.include_tasks:
> +    file: install-deps/main.yml
> +    apply:
> +      delegate_to: localhost
> +  when:
> +    - bootlinux_9p|bool
> +
>   # We do this regardless of what distro you use
>   - name: Install b4
>     become: yes
> @@ -28,6 +40,10 @@
>       - ansible_facts['os_family']|lower != 'debian'
>     tags: linux
>   
> +# Needs root on the controller
> +#
> +# Someday this should be done only once when installing kdevops
> +# on the Ansible control node.

@yawn_brendan shared this idea of running kdevops inside LXC with kvm 
support. Otherwise, host setup may become a bit complex to do it manually.

Thoughts?


>   - name: Install b4 on host
>     become: yes
>     become_method: sudo
> diff --git a/workflows/linux/Makefile b/workflows/linux/Makefile
> index ecce273a4f67..aaf604a1071a 100644
> --- a/workflows/linux/Makefile
> +++ b/workflows/linux/Makefile
> @@ -90,9 +90,6 @@ LINUX_HELP_EXTRA :=
>   
>   PHONY += linux
>   linux: $(KDEVOPS_NODES)
> -	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
> -		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux-local.yml \
> -		--extra-vars="$(BOOTLINUX_ARGS)"
>   	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
>   		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
>   		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)