From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Daniel Gomez <da.gomez@kernel.org>, Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v2 4/4] bootlinux: Fold bootlinux-local into the bootlinux role
Date: Mon, 19 May 2025 12:21:31 -0400 [thread overview]
Message-ID: <20250519162131.381359-5-cel@kernel.org> (raw)
In-Reply-To: <20250519162131.381359-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
Clean up: Adopt the more common mechanism for running a local action
instead of running a separate play.
No change in behavior is expected.
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 | 8 ++++++++
workflows/linux/Makefile | 3 ---
6 files changed, 8 insertions(+), 31 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 ab647d9862a8..01ad2344185f 100644
--- a/playbooks/roles/bootlinux/tasks/main.yml
+++ b/playbooks/roles/bootlinux/tasks/main.yml
@@ -15,6 +15,14 @@
ansible.builtin.import_tasks:
file: install-deps/main.yml
+- name: Install dependencies to build the Linux kernel
+ delegate_to: localhost
+ run_once: true
+ ansible.builtin.import_tasks:
+ file: install-deps/main.yml
+ when:
+ - bootlinux_9p|bool
+
# We do this regardless of what distro you use
- name: Install b4
become: yes
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)
--
2.49.0
next prev parent reply other threads:[~2025-05-19 16:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-19 16:21 [PATCH v2 0/4] Remove the bootlinux-local role cel
2025-05-19 16:21 ` [PATCH v2 1/4] bootlinux: Remove the 'linux' tag cel
2025-05-20 20:43 ` Daniel Gomez
2025-05-19 16:21 ` [PATCH v2 2/4] bootlinux: Modernize install-deps/main.yml cel
2025-05-20 18:27 ` Daniel Gomez
2025-05-19 16:21 ` [PATCH v2 3/4] bootlinux: Switch to import_tasks for install-deps cel
2025-05-20 20:33 ` Daniel Gomez
2025-05-19 16:21 ` cel [this message]
2025-05-20 20:41 ` [PATCH v2 4/4] bootlinux: Fold bootlinux-local into the bootlinux role Daniel Gomez
2025-05-20 18:28 ` [PATCH v2 0/4] Remove the bootlinux-local role Daniel Gomez
2025-05-20 20:47 ` Daniel Gomez
2025-05-20 20:52 ` Chuck Lever
2025-05-21 7:42 ` Daniel Gomez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250519162131.381359-5-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=da.gomez@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.