All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <cel@kernel.org>
To: Daniel Gomez <da.gomez@kernel.org>
Cc: <kdevops@lists.linux.dev>
Subject: [PATCH] Makefile: terraform wasn't building the kdevops_nodes file
Date: Thu,  2 Oct 2025 16:13:38 -0400	[thread overview]
Message-ID: <20251002201338.3592784-1-cel@kernel.org> (raw)

From: Daniel Gomez <da.gomez@kernel.org>

When "make bringup" runs "terraform plan", it complains that the
kdevops_nodes variable isn't set.

extra_vars.yaml does contain the variable, but I'm guessing that
somehow gen_nodes runs after gen_tfvars now? Not really sure.

Daniel suggests:
> I think it'd be best to move KDEVOPS_NODES just after we assign
> the filename to it (provision.Makefile -> guestfs.Makefile):

Fixes: 5457b742d611 ("Makefile: fix target dependency order")
Signed-off-by: Daniel Gomez <da.gomez@kernel.org>
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Daniel, I've totally lost the plot. Is this patch adequate for fixing
the "terraform plan" failures, or do you have something else in mind?

diff --git a/Makefile b/Makefile
index 9ea479c95a10..565f2b2bb4ee 100644
--- a/Makefile
+++ b/Makefile
@@ -144,16 +144,16 @@ endif
 DEFAULT_DEPS += $(ANSIBLE_CFG_FILE)
 DEFAULT_DEPS += $(ANSIBLE_INVENTORY_FILE)
 
-ifneq (,$(KDEVOPS_NODES))
-DEFAULT_DEPS += $(KDEVOPS_NODES)
-endif
-
 include scripts/provision.Makefile
 include scripts/firstconfig.Makefile
 include scripts/systemd-timesync.Makefile
 include scripts/journal-server.Makefile
 include scripts/update_etc_hosts.Makefile
 
+ifneq (,$(KDEVOPS_NODES))
+DEFAULT_DEPS += $(KDEVOPS_NODES)
+endif
+
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_DEPS_EARLY)
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_PROVISIONED_DEVCONFIG)
 
-- 
2.51.0


             reply	other threads:[~2025-10-02 20:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-02 20:13 Chuck Lever [this message]
2025-10-02 20:38 ` [PATCH] Makefile: terraform wasn't building the kdevops_nodes file 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=20251002201338.3592784-1-cel@kernel.org \
    --to=cel@kernel.org \
    --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.