From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D44031E502 for ; Sun, 18 May 2025 14:18:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747577922; cv=none; b=ZlAizRCxSTU+iNBkcsNO7OYUv6CByapYaCMA+97iXy+BXCP1EJ09syNX47U3mmennAwy55vZ/8q3GRmVPS179LO6kj/vUUGWFQg1FoeMzLSSvxZDNBSQYMw0zO2L2XkNAyiOieCiZM3+Doodc87dHgapeZcXmQ69b8S9fDz0G/A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747577922; c=relaxed/simple; bh=8LO1JusvwlyVaJF22ywnlbGEj9QwliaZfAcs4+/kCiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cXwwCkE9SqtZWdyKj2J9nYGrJE8Z0r5ZAG/bn0wRtjbfeUQA3WcAS1hmF2sMmtnSWBpCEpF4zAE2XHtccQrZ6sbI3wfQ0F5z5cFTfnvaARhV+93A4IXEC8jGsyEHxcXim9wGLgDTjnEWTTNLMjpuIa7zKKSaJTvxygrGfuhAlv8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DUOYbX93; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DUOYbX93" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04133C4CEEB; Sun, 18 May 2025 14:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747577921; bh=8LO1JusvwlyVaJF22ywnlbGEj9QwliaZfAcs4+/kCiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUOYbX93//AlvId5Czpv3sOonl/ukKQZIUWkvMDjHSgMQx5CRMKaSY7XlGblRl/8p W7uWkrn5iUgGHtOAZN3mbAJbCdH5MI4lXe6UqN8TDj2+nM4nSMliXqmkaxSsQ8TsJN 8bOqjivw6IgIpjoRdmBlPX953Fuht1q3Md7I72fAQo2iXglaVlVpPU6VAUBwdUjgYw KcrSlvWGQ6I9kbP6NGbUThPkB1NvMwk7qd1rzimu8KszkhaqxP4haLVvex27d2vHpv urq8o9KTidOKZ2gMdEEjSzKWfHQKMDrKMkJIz7Mbbq8H7kSspstQaymIzQDbGMw9QU nIR8bOBG6kLlg== From: cel@kernel.org To: Cc: Daniel Gomez , Chuck Lever Subject: [PATCH v1 2/2] bootlinux: Fold bootlinux-local into the bootlinux role Date: Sun, 18 May 2025 10:18:38 -0400 Message-ID: <20250518141838.176772-2-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250518141838.176772-1-cel@kernel.org> References: <20250518141838.176772-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever Rather than running a separate play, adopt the more common mechanism for running a local action. Signed-off-by: Chuck Lever --- 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 +# 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. - 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) -- 2.49.0