linux: Edit cel-linux.yaml
PATCH 1/1 linux: Edit cel-linux.yaml
From: Chuck Lever <[email protected]>
Add the nfsd-testing testing branch, and correct a typo.
--- workflows/linux/refs/default/Kconfig.cel-linux | 12 +++++++++--- workflows/linux/refs/static/cel-linux.yaml | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-)
I'm having some trouble getting this new infrastructure to work.
"make menuconfig" leaves this line in .config:
CONFIG_BOOTLINUX_TREE_REF="BOOTLINUX_TREE_CEL_REF"
And then "make bringup" fails to clone Linux because that's not a valid ref.
workflows/linux/refs/default/Kconfig.cel-linux +9 -3
@@ -12,9 +12,14 @@ config BOOTLINUX_TREE_CEL_LINUX_REF_NEXT Pull the nfsd-next branch. config BOOTLINUX_TREE_CEL_LINUX_REF_FIXES - bool "nfsd-fixed" + bool "nfsd-fixes" help - Pull the nfsd-fixed branch. + Pull the nfsd-fixes branch. + +config BOOTLINUX_TREE_CEL_LINUX_REF_TESTING + bool "nfsd-testing" + help + Pull the nfsd-testing branch. config BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM bool "custom"
@@ -26,7 +31,8 @@ endchoice config BOOTLINUX_TREE_CEL_LINUX_REF string default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT - default "nfsd-fixed" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + default "nfsd-testing" if BOOTLINUX_TREE_CEL_LINUX_REF_TESTING default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFS
workflows/linux/refs/static/cel-linux.yaml +6 -2
@@ -6,8 +6,12 @@ configs: help: "Pull the nfsd-next branch." - fixes: config: BOOTLINUX_TREE_CEL_LINUX_REF_FIXES - ref: "nfsd-fixed" - help: "Pull the nfsd-fixed branch." + ref: "nfsd-fixes" + help: "Pull the nfsd-fixes branch." + - testing: + config: BOOTLINUX_TREE_CEL_LINUX_REF_TESTING + ref: "nfsd-testing" + help: "Pull the nfsd-testing branch." - custom: config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME
Signature · 1 line
2.45.2
Quoted 10 lines · On Fri, Jun 28, 2024 at 05:20:09PM -0400, [email protected] wrote:
From: Chuck Lever <[email protected]>
Add the nfsd-testing testing branch, and correct a typo.
Signed-off-by Chuck Lever <[email protected]>--- workflows/linux/refs/default/Kconfig.cel-linux | 12 +++++++++--- workflows/linux/refs/static/cel-linux.yaml | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-)
Quoted 8 lines
I'm having some trouble getting this new infrastructure to work.
"make menuconfig" leaves this line in .config:
CONFIG_BOOTLINUX_TREE_REF="BOOTLINUX_TREE_CEL_REF"And then "make bringup" fails to clone Linux because that's not a valid ref.
I found the issue: a typo introduced by aecf1ef48444 ("linux: rename refactor"). Pushed a fix, and this patch, to main.
Quoted 53 lines
workflows/linux/refs/default/Kconfig.cel-linux +9
-3@@ -12,9 +12,14 @@ config BOOTLINUX_TREE_CEL_LINUX_REF_NEXT Pull the nfsd-next branch. config BOOTLINUX_TREE_CEL_LINUX_REF_FIXES - bool "nfsd-fixed" + bool "nfsd-fixes" help - Pull the nfsd-fixed branch. + Pull the nfsd-fixes branch. + +config BOOTLINUX_TREE_CEL_LINUX_REF_TESTING + bool "nfsd-testing" + help + Pull the nfsd-testing branch. config BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM bool "custom"@@ -26,7 +31,8 @@ endchoice config BOOTLINUX_TREE_CEL_LINUX_REF string default "nfsd-next" if BOOTLINUX_TREE_CEL_LINUX_REF_NEXT - default "nfsd-fixed" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + default "nfsd-fixes" if BOOTLINUX_TREE_CEL_LINUX_REF_FIXES + default "nfsd-testing" if BOOTLINUX_TREE_CEL_LINUX_REF_TESTING default BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAME if BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM endif # !HAVE_BOOTLINUX_TREE_CEL_LINUX_USER_REFSworkflows/linux/refs/static/cel-linux.yaml +6
-2@@ -6,8 +6,12 @@ configs: help: "Pull the nfsd-next branch." - fixes: config: BOOTLINUX_TREE_CEL_LINUX_REF_FIXES - ref: "nfsd-fixed" - help: "Pull the nfsd-fixed branch." + ref: "nfsd-fixes" + help: "Pull the nfsd-fixes branch." + - testing: + config: BOOTLINUX_TREE_CEL_LINUX_REF_TESTING + ref: "nfsd-testing" + help: "Pull the nfsd-testing branch." - custom: config: BOOTLINUX_TREE_CEL_LINUX_REF_CUSTOM ref: BOOTLINUX_CEL_LINUX_CUSTOM_REF_NAMESignature · 1 line
2.45.2
Signature · 1 line
Chuck Lever