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 1/4] bootlinux: Remove the 'linux' tag
Date: Mon, 19 May 2025 12:21:28 -0400 [thread overview]
Message-ID: <20250519162131.381359-2-cel@kernel.org> (raw)
In-Reply-To: <20250519162131.381359-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
Clean up: This tag is not set by any invocation of the bootlinux
role.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
.../tasks/install-deps/debian/main.yml | 2 -
playbooks/roles/bootlinux/tasks/main.yml | 80 +++++++++----------
.../bootlinux/tasks/update-grub/debian.yml | 2 +-
.../bootlinux/tasks/update-grub/install.yml | 12 +--
.../bootlinux/tasks/update-grub/redhat.yml | 2 +-
.../bootlinux/tasks/update-grub/suse.yml | 2 +-
6 files changed, 48 insertions(+), 52 deletions(-)
diff --git a/playbooks/roles/bootlinux/tasks/install-deps/debian/main.yml b/playbooks/roles/bootlinux/tasks/install-deps/debian/main.yml
index 51b216e47b06..dd1e53daf464 100644
--- a/playbooks/roles/bootlinux/tasks/install-deps/debian/main.yml
+++ b/playbooks/roles/bootlinux/tasks/install-deps/debian/main.yml
@@ -6,7 +6,6 @@
become_method: sudo
apt:
update_cache: yes
- tags: linux
# apt-get build-dep does not capture all requirements
- name: Install Linux kernel build dependencies
@@ -41,4 +40,3 @@
- libncurses-dev
- b4
state: present
- tags: linux
diff --git a/playbooks/roles/bootlinux/tasks/main.yml b/playbooks/roles/bootlinux/tasks/main.yml
index 9ad675b3f278..cb98ab3077e8 100644
--- a/playbooks/roles/bootlinux/tasks/main.yml
+++ b/playbooks/roles/bootlinux/tasks/main.yml
@@ -26,7 +26,6 @@
- target_linux_install_b4 is defined
- target_linux_install_b4
- ansible_facts['os_family']|lower != 'debian'
- tags: linux
- name: Install b4 on host
become: yes
@@ -39,7 +38,6 @@
- target_linux_install_b4
- bootlinux_9p|bool
- ansible_facts['os_family']|lower != 'debian'
- tags: linux
run_once: true
delegate_to: localhost
@@ -76,7 +74,7 @@
- name: Add safe exception for a clone
command: "git config --global --add safe.directory {{ target_linux_git }}"
- tags: [ 'linux', 'git', 'clone']
+ tags: [ 'git', 'clone']
when:
- bootlinux_9p|bool
- target_linux_git is string and target_linux_git.startswith('/')
@@ -114,7 +112,7 @@
delay: 5
register: result
until: not result.failed
- tags: [ 'linux', 'git', 'clone']
+ tags: [ 'git', 'clone']
when:
- not bootlinux_9p|bool
@@ -129,7 +127,7 @@
delay: 5
register: result
until: not result.failed
- tags: [ 'linux', 'git', 'clone']
+ tags: [ 'git', 'clone']
when:
- bootlinux_9p|bool
- not bootlinux_tree_set_by_cli|bool
@@ -143,7 +141,7 @@
owner: "{{ data_user }}"
group: "{{ data_group }}"
mode: 0644
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- not bootlinux_9p|bool
- target_linux_extra_patch is defined
@@ -153,7 +151,7 @@
src: "{{ target_linux_extra_patch }}"
dest: "{{ bootlinux_9p_host_path }}/{{ target_linux_extra_patch }}"
mode: 0644
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- bootlinux_9p|bool
- target_linux_extra_patch is defined
@@ -164,7 +162,7 @@
command: "git am {{ target_linux_extra_patch }}"
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'git', 'extra-patch', 'skip_ansible_lint' ]
+ tags: [ 'git', 'extra-patch', 'skip_ansible_lint' ]
when:
- not bootlinux_9p|bool
- target_linux_extra_patch is defined
@@ -173,7 +171,7 @@
command: "git am {{ target_linux_extra_patch }}"
args:
chdir: "{{ bootlinux_9p_host_path }}"
- tags: [ 'linux', 'git', 'extra-patch', 'skip_ansible_lint' ]
+ tags: [ 'git', 'extra-patch', 'skip_ansible_lint' ]
when:
- bootlinux_9p|bool
- target_linux_extra_patch is defined
@@ -188,7 +186,7 @@
if ! $(git config --get user.name) ; then
git config --global user.name user
fi
- tags: [ 'linux', 'git', 'extra-patch', 'skip_ansible_lint' ]
+ tags: [ 'git', 'extra-patch', 'skip_ansible_lint' ]
when:
- target_linux_apply_patch_message_id is defined
- target_linux_apply_patch_message_id | length > 0
@@ -204,7 +202,7 @@
shell: b4 am -o - {{target_linux_apply_patch_message_id}} | git am
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'extra-patch', 'skip_ansible_lint' ]
+ tags: [ 'extra-patch', 'skip_ansible_lint' ]
when:
- not bootlinux_9p|bool
- target_linux_apply_patch_message_id is defined
@@ -215,7 +213,7 @@
shell: b4 am -o - {{target_linux_apply_patch_message_id}} | git am
args:
chdir: "{{ bootlinux_9p_host_path }}"
- tags: [ 'linux', 'extra-patch', 'skip_ansible_lint' ]
+ tags: [ 'extra-patch', 'skip_ansible_lint' ]
when:
- bootlinux_9p|bool
- target_linux_apply_patch_message_id is defined
@@ -320,7 +318,7 @@
owner: "{{ data_user }}"
group: "{{ data_group }}"
mode: 0644
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- not bootlinux_9p|bool
@@ -329,7 +327,7 @@
src: "{{ linux_config }}"
dest: "{{ bootlinux_9p_host_path }}/.config"
mode: 0644
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- bootlinux_9p|bool
run_once: true
@@ -337,14 +335,14 @@
- name: Set kernel localversion if requested on the target nodes
shell: "echo {{ target_linux_localversion }} > {{ target_linux_dir_path }}/localversion"
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- not bootlinux_9p|bool
- target_linux_localversion is defined and target_linux_localversion != ""
- name: Set kernel localversion if requested on the control node
shell: "echo {{ target_linux_localversion }} > {{ bootlinux_9p_host_path }}/localversion"
- tags: [ 'linux', 'git', 'config' ]
+ tags: [ 'git', 'config' ]
when:
- bootlinux_9p|bool
- target_linux_localversion is defined and target_linux_localversion != ""
@@ -361,7 +359,7 @@
args:
chdir: "{{ target_linux_dir_path }}"
executable: /bin/bash
- tags: [ 'linux', 'oldconfig' ]
+ tags: [ 'oldconfig' ]
when:
- not bootlinux_9p|bool
@@ -375,7 +373,7 @@
args:
chdir: "{{ bootlinux_9p_host_path }}"
executable: /bin/bash
- tags: [ 'linux', 'oldconfig' ]
+ tags: [ 'oldconfig' ]
when:
- bootlinux_9p|bool
run_once: true
@@ -387,7 +385,7 @@
changed_when: "build.rc == 0"
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- not bootlinux_9p|bool
@@ -397,7 +395,7 @@
changed_when: "build_cxl_test.rc == 0"
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'build-linux', 'cxl-build' ]
+ tags: [ 'build-linux', 'cxl-build' ]
when:
- not bootlinux_9p|bool
- bootlinux_cxl_test|bool
@@ -406,7 +404,7 @@
stat:
path: "{{ target_linux_dir_path }}/certs/signing_key.pem"
register: snaik_oil_file
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- not bootlinux_9p|bool
@@ -414,14 +412,14 @@
file:
path: "{{ target_linux_dir_path }}/certs/signing_key.pem"
mode: "0755"
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- not bootlinux_9p|bool
- snaik_oil_file.stat.exists
- name: Get nproc on the control node
command: "{{ num_jobs }}"
- tags: [ 'linux', 'build-linux', 'configure', 'cxl-build' ]
+ tags: [ 'build-linux', 'configure', 'cxl-build' ]
register: nproc_9p
when:
- bootlinux_9p|bool
@@ -433,7 +431,7 @@
chdir: "{{ bootlinux_9p_host_path }}"
target: kernelversion
register: target_linux_kernelversion
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
- target_linux_kernelrelease | length > 0
@@ -443,7 +441,7 @@
- name: Generate user kernelrelease {{ target_linux_kernelversion.stdout }}-{{ target_linux_kernelrelease }}
set_fact:
target_user_kernelrelease: "{{ target_linux_kernelversion.stdout }}-{{ target_linux_kernelrelease }}"
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
- target_linux_kernelrelease | length > 0
@@ -456,7 +454,7 @@
chdir: "{{ bootlinux_9p_host_path }}"
params:
KERNELRELEASE={{ target_user_kernelrelease }}
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
- target_linux_kernelrelease | length > 0
@@ -467,7 +465,7 @@
make:
jobs: "{{ nproc_9p.stdout }}"
chdir: "{{ bootlinux_9p_host_path }}"
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
- target_linux_kernelrelease | length == 0
@@ -480,7 +478,7 @@
chdir: "{{ bootlinux_9p_host_path }}"
params:
M: "tools/testing/cxl"
- tags: [ 'linux', 'build-linux', 'cxl-build' ]
+ tags: [ 'build-linux', 'cxl-build' ]
when:
- bootlinux_9p|bool
- bootlinux_cxl_test|bool
@@ -491,7 +489,7 @@
stat:
path: "{{ bootlinux_9p_host_path }}/certs/signing_key.pem"
register: snaik_oil_file_9p
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
run_once: true
@@ -501,7 +499,7 @@
file:
path: "{{ bootlinux_9p_host_path }}/certs/signing_key.pem"
mode: "0755"
- tags: [ 'linux', 'build-linux' ]
+ tags: [ 'build-linux' ]
when:
- bootlinux_9p|bool
- snaik_oil_file_9p.stat.exists
@@ -552,7 +550,7 @@
- "{{ uninstall_kernel_ver }}"
- "{{ uninstall_kernel_ver }}+"
register: found_uninstall_kfiles
- tags: [ 'linux', 'uninstall-linux' ]
+ tags: [ 'uninstall-linux' ]
when:
- uninstall_kernel_enable|bool
- uninstall_kernel_ver is defined
@@ -564,7 +562,7 @@
file:
state: absent
path: "{{ item.path }}"
- tags: [ 'linux', 'uninstall-linux' ]
+ tags: [ 'uninstall-linux' ]
with_items:
- "{{ found_uninstall_kfiles.files }}"
loop_control:
@@ -585,10 +583,10 @@
path: /etc/default/grub
regexp: '^GRUB_TERMINAL='
line: GRUB_TERMINAL="console serial"
- tags: [ 'linux', 'git', 'config', 'console' ]
+ tags: [ 'git', 'config', 'console' ]
- name: Update your boot GRUB file if necessary
- tags: [ 'linux', 'uninstall-linux', 'manual-update-grub', 'console' ]
+ tags: [ 'uninstall-linux', 'manual-update-grub', 'console' ]
import_tasks: update-grub/main.yml
- name: Ensure we have DEFAULTDEBUG set
@@ -600,7 +598,7 @@
path: /etc/sysconfig/kernel
regexp: '^DEFAULTDEBUG='
line: DEFAULTDEBUG=yes
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
when: ansible_facts['os_family']|lower == 'redhat'
- name: Install {{ target_linux_tree }} on the target nodes
@@ -612,7 +610,7 @@
changed_when: "install_done.rc == 0"
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'install-linux' ]
+ tags: [ 'install-linux' ]
- name: Install {{ target_linux_tree }} cxl_test on the target nodes
become: yes
@@ -623,12 +621,12 @@
changed_when: "install_done.rc == 0"
args:
chdir: "{{ target_linux_dir_path }}"
- tags: [ 'linux', 'install-linux', 'cxl-install' ]
+ tags: [ 'install-linux', 'cxl-install' ]
when:
- kdevops_workflow_enable_cxl|bool
- name: Set the default kernel if necessary
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
import_tasks: update-grub/install.yml
# when:
# - ansible_facts['os_family']|lower != 'redhat'
@@ -637,16 +635,16 @@
become: yes
become_method: sudo
reboot:
- tags: [ 'linux', 'reboot' ]
+ tags: [ 'reboot' ]
- name: Run uname
command: "uname -r"
register: uname_cmd
- tags: [ 'linux', 'git', 'config', 'uname' ]
+ tags: [ 'git', 'config', 'uname' ]
- name: Check kernel uname
debug:
msg: "Target kernel {{ target_linux_ref }} Running kernel {{ running_kernel }}"
vars:
running_kernel: "{{ uname_cmd.stdout_lines.0 }}"
- tags: [ 'linux', 'git', 'config', 'uname' ]
+ tags: [ 'git', 'config', 'uname' ]
diff --git a/playbooks/roles/bootlinux/tasks/update-grub/debian.yml b/playbooks/roles/bootlinux/tasks/update-grub/debian.yml
index 3c7deea2161a..c9eb1e412dc3 100644
--- a/playbooks/roles/bootlinux/tasks/update-grub/debian.yml
+++ b/playbooks/roles/bootlinux/tasks/update-grub/debian.yml
@@ -5,4 +5,4 @@
command: "update-grub"
register: grub_update
changed_when: "grub_update.rc == 0"
- tags: [ 'linux', 'manual-update-grub', 'console' ]
+ tags: [ 'manual-update-grub', 'console' ]
diff --git a/playbooks/roles/bootlinux/tasks/update-grub/install.yml b/playbooks/roles/bootlinux/tasks/update-grub/install.yml
index 7ca50c724fb2..c1b1b8a35129 100644
--- a/playbooks/roles/bootlinux/tasks/update-grub/install.yml
+++ b/playbooks/roles/bootlinux/tasks/update-grub/install.yml
@@ -76,7 +76,7 @@
path: /etc/default/grub
regexp: '^GRUB_DEFAULT='
line: GRUB_DEFAULT=saved
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
- name: Use GRUB_DISABLE_SUBMENU=y to enable grub-set-default use with one digit
become: yes
@@ -87,10 +87,10 @@
path: /etc/default/grub
regexp: '^GRUB_DISABLE_SUBMENU='
line: GRUB_DISABLE_SUBMENU=y
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
- name: Update your boot GRUB file if necessary to ensure GRUB flat earth
- tags: [ 'linux', 'uninstall-linux', 'manual-update-grub', 'console' ]
+ tags: [ 'uninstall-linux', 'manual-update-grub', 'console' ]
import_tasks: update-grub/main.yml
- name: Set file used to extract KERNELRELEASE variable
@@ -139,7 +139,7 @@
vars:
target_kernel: "{{ target_linux_ref | replace('v', '') }}"
register: grub_boot_number_cmd
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
when: kernel_release_file.stat.exists
- name: Obtain command to set default kernel to boot
@@ -161,7 +161,7 @@
command: "{{ grub_set_default_boot_kernel }} \"{{ target_boot_entry }}\""
vars:
target_boot_entry: "{{ grub_boot_number_cmd.stdout_lines.0 }}"
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
when:
- grub_boot_number_cmd.rc == 0
- grub_boot_number_cmd.stdout != ""
@@ -172,7 +172,7 @@
vars:
target_kernel: "{{ target_linux_ref | replace('v', '') }}"
target_boot_entry: "{{ grub_boot_number_cmd.stdout_lines.0 }}"
- tags: [ 'linux', 'git', 'config', 'saved' ]
+ tags: [ 'git', 'config', 'saved' ]
when:
- grub_boot_number_cmd.rc == 0
- grub_boot_number_cmd.stdout != ""
diff --git a/playbooks/roles/bootlinux/tasks/update-grub/redhat.yml b/playbooks/roles/bootlinux/tasks/update-grub/redhat.yml
index a4c9236ecc6d..d04662a0cb97 100644
--- a/playbooks/roles/bootlinux/tasks/update-grub/redhat.yml
+++ b/playbooks/roles/bootlinux/tasks/update-grub/redhat.yml
@@ -28,4 +28,4 @@
command: "grub2-mkconfig -o {{ grub_config_file }}"
register: grub_update
changed_when: "grub_update.rc == 0"
- tags: [ 'linux', 'manual-update-grub', 'console' ]
+ tags: [ 'manual-update-grub', 'console' ]
diff --git a/playbooks/roles/bootlinux/tasks/update-grub/suse.yml b/playbooks/roles/bootlinux/tasks/update-grub/suse.yml
index b148e21d82c2..f6b64d76a2fd 100644
--- a/playbooks/roles/bootlinux/tasks/update-grub/suse.yml
+++ b/playbooks/roles/bootlinux/tasks/update-grub/suse.yml
@@ -5,4 +5,4 @@
command: "update-bootloader --refresh"
register: grub_update
changed_when: "grub_update.rc == 0"
- tags: [ 'linux', 'manual-update-grub', 'console' ]
+ tags: [ 'manual-update-grub', 'console' ]
--
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 ` cel [this message]
2025-05-20 20:43 ` [PATCH v2 1/4] bootlinux: Remove the 'linux' tag 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 ` [PATCH v2 4/4] bootlinux: Fold bootlinux-local into the bootlinux role cel
2025-05-20 20:41 ` 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-2-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox