From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BCE5416EC19 for ; Wed, 4 Sep 2024 23:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492644; cv=none; b=PmSC2T3PefsD4KePTvWviQADQ5Z5ELVoquilDWAlCJuGsJbegbqHK8nFWWUHZCeho2i1dTisTfCV8/tPPOWJ9yiS3P0NsYnNVJOZUy/MuQsQU344DNEOKAgShCpPPXWzeM/HXi16Wu3M5jqQJK1bXJ05g1yfrE0l7BmsUA0PcnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492644; c=relaxed/simple; bh=0r8nW8NNo4nrwX6/Hjj79wSxG14wDTc46GkVbDaYb6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iA8qsxsGy7Zbc4enPgJfEmufHJUdEiSYSuFow+0v3xX6m12EQNkULFrRNRUUgnadIKb/1/EbSZUTpr7kr+4iy2O9TQAKRDANgGn/uPqnWPiUFMpkJp5pSJcwtvCJXoN72Uk5b5TfHRMOH/JRMJeRLjsXLo1AqFY2im/i2thquEM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=gL7N5xdv; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="gL7N5xdv" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=1C6Ng8LQEWZ/7btSmI889EuA64V5A6dWB+1nnLR0R4Y=; b=gL7N5xdvqqVto9FULIptZYKqpX 5FhPTSxvfj5whhDx/ueB14CdgWEt1hoARHap+/Ucj74Lk8KydGdBkgrrIpSlaulljZXmv9jXYsNYX R62IZrVwECTWheVt5rLZvHk6CMzASduFDgz32Z4a4Xrp3JLhxsBgYg/fuaz3O6B+D/1DWKOKpAfXC iOp2hv95+D3QALa8ZiaxgPhnJOgnEplhHfOitrlfJ5QvcGoIKf953BtGv7lSZ3JhngR7CcybVu3zX 4k0kknr1Ul5Y13VQHy5YGVQmk9ZrVNqfvlMUBg4dqNynaXKxbCqMJEdG4K5l8YZWyT+MZ7iJ8RGdO G3TEAUcw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzST-00000006MSL-0YP3; Wed, 04 Sep 2024 23:30:41 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, chuck.lever@oracle.com, da.gomez@samsung.com, jlayton@kernel.org Cc: mcgrof@kernel.org Subject: [PATCH 4/5] workflows/Makefile: replace direct named entries with output yaml Date: Wed, 4 Sep 2024 16:30:39 -0700 Message-ID: <20240904233040.1516250-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240904233040.1516250-1-mcgrof@kernel.org> References: <20240904233040.1516250-1-mcgrof@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 Sender: Luis Chamberlain There are workflow variables which have an exact respective ansible variable, just use the new "output yaml" so we can aggregate these automatically directly from kconfig. Signed-off-by: Luis Chamberlain --- kconfigs/workflows/Kconfig | 8 ++++++++ workflows/Makefile | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kconfigs/workflows/Kconfig b/kconfigs/workflows/Kconfig index 28262741e792..6530ce3cf50e 100644 --- a/kconfigs/workflows/Kconfig +++ b/kconfigs/workflows/Kconfig @@ -260,6 +260,7 @@ endif # !WORKFLOWS_DEDICATED_WORKFLOW config KDEVOPS_WORKFLOW_ENABLE_FSTESTS bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_FSTESTS || KDEVOPS_WORKFLOW_DEDICATE_FSTESTS if KDEVOPS_WORKFLOW_ENABLE_FSTESTS @@ -270,6 +271,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_FSTESTS config KDEVOPS_WORKFLOW_ENABLE_BLKTESTS bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_BLKTESTS || KDEVOPS_WORKFLOW_DEDICATE_BLKTESTS if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS @@ -280,6 +282,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_BLKTESTS config KDEVOPS_WORKFLOW_ENABLE_CXL bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_CXL || KDEVOPS_WORKFLOW_DEDICATE_CXL if KDEVOPS_WORKFLOW_ENABLE_CXL @@ -290,6 +293,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_CXL config KDEVOPS_WORKFLOW_ENABLE_PYNFS bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_PYNFS || KDEVOPS_WORKFLOW_DEDICATE_PYNFS select KDEVOPS_SETUP_NFSD @@ -301,6 +305,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_PYNFS config KDEVOPS_WORKFLOW_ENABLE_SELFTESTS bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_SELFTESTS || KDEVOPS_WORKFLOW_DEDICATE_SELFTESTS if KDEVOPS_WORKFLOW_ENABLE_SELFTESTS @@ -311,6 +316,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_SELFTESTS config KDEVOPS_WORKFLOW_ENABLE_GITR bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_GITR || KDEVOPS_WORKFLOW_DEDICATE_GITR if KDEVOPS_WORKFLOW_ENABLE_GITR @@ -321,6 +327,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_GITR config KDEVOPS_WORKFLOW_ENABLE_LTP bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_LTP || KDEVOPS_WORKFLOW_DEDICATE_LTP if KDEVOPS_WORKFLOW_ENABLE_LTP @@ -331,6 +338,7 @@ endif # KDEVOPS_WORKFLOW_ENABLE_GITR config KDEVOPS_WORKFLOW_ENABLE_NFSTEST bool + output yaml default y if KDEVOPS_WORKFLOW_NOT_DEDICATED_ENABLE_NFSTEST || KDEVOPS_WORKFLOW_DEDICATE_NFSTEST if KDEVOPS_WORKFLOW_ENABLE_NFSTEST diff --git a/workflows/Makefile b/workflows/Makefile index e305f2629abf..34afb9af3f9b 100644 --- a/workflows/Makefile +++ b/workflows/Makefile @@ -15,27 +15,22 @@ WORKFLOW_ARGS += kdevops_bootlinux='False' endif ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS)) -WORKFLOW_ARGS += kdevops_workflow_enable_fstests='True' include workflows/fstests/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_BLKTESTS)) -WORKFLOW_ARGS += kdevops_workflow_enable_blktests='True' include workflows/blktests/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_BLKTESTS == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL)) -WORKFLOW_ARGS += kdevops_workflow_enable_cxl='True' include workflows/cxl/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_PYNFS)) -WORKFLOW_ARGS += kdevops_workflow_enable_pynfs='True' include workflows/pynfs/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_PYNFS == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_SELFTESTS)) -WORKFLOW_ARGS += kdevops_workflow_enable_selftests='True' include workflows/selftests/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_SELFTESTS @@ -44,17 +39,14 @@ include workflows/demos/reboot-limit/Makefile endif # CONFIG_WORKFLOWS_REBOOT_LIMIT == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_GITR)) -WORKFLOW_ARGS += kdevops_workflow_enable_gitr='True' include workflows/gitr/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_GITR == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_LTP)) -WORKFLOW_ARGS += kdevops_workflow_enable_ltp='True' include workflows/ltp/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_LTP == y ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_NFSTEST)) -WORKFLOW_ARGS += kdevops_workflow_enable_nfstest='True' include workflows/nfstest/Makefile endif # CONFIG_KDEVOPS_WORKFLOW_ENABLE_NFSTEST == y -- 2.43.0