* [PATCH] linux: Edit cel-linux.yaml
@ 2024-06-28 21:20 cel
2024-06-29 21:29 ` Chuck Lever
0 siblings, 1 reply; 2+ messages in thread
From: cel @ 2024-06-28 21:20 UTC (permalink / raw)
To: kdevops; +Cc: Chuck Lever
From: Chuck Lever <chuck.lever@oracle.com>
Add the nfsd-testing testing branch, and correct a typo.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
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.
diff --git a/workflows/linux/refs/default/Kconfig.cel-linux b/workflows/linux/refs/default/Kconfig.cel-linux
index 692236e94dbd..56071e65328b 100644
--- a/workflows/linux/refs/default/Kconfig.cel-linux
+++ b/workflows/linux/refs/default/Kconfig.cel-linux
@@ -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
diff --git a/workflows/linux/refs/static/cel-linux.yaml b/workflows/linux/refs/static/cel-linux.yaml
index bba35efb8214..8b94b9f3449c 100644
--- a/workflows/linux/refs/static/cel-linux.yaml
+++ b/workflows/linux/refs/static/cel-linux.yaml
@@ -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
--
2.45.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] linux: Edit cel-linux.yaml
2024-06-28 21:20 [PATCH] linux: Edit cel-linux.yaml cel
@ 2024-06-29 21:29 ` Chuck Lever
0 siblings, 0 replies; 2+ messages in thread
From: Chuck Lever @ 2024-06-29 21:29 UTC (permalink / raw)
To: cel; +Cc: kdevops
On Fri, Jun 28, 2024 at 05:20:09PM -0400, cel@kernel.org wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
>
> Add the nfsd-testing testing branch, and correct a typo.
>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
> 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.
I found the issue: a typo introduced by aecf1ef48444 ("linux: rename
refactor"). Pushed a fix, and this patch, to main.
> diff --git a/workflows/linux/refs/default/Kconfig.cel-linux b/workflows/linux/refs/default/Kconfig.cel-linux
> index 692236e94dbd..56071e65328b 100644
> --- a/workflows/linux/refs/default/Kconfig.cel-linux
> +++ b/workflows/linux/refs/default/Kconfig.cel-linux
> @@ -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
> diff --git a/workflows/linux/refs/static/cel-linux.yaml b/workflows/linux/refs/static/cel-linux.yaml
> index bba35efb8214..8b94b9f3449c 100644
> --- a/workflows/linux/refs/static/cel-linux.yaml
> +++ b/workflows/linux/refs/static/cel-linux.yaml
> @@ -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
> --
> 2.45.2
>
--
Chuck Lever
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-29 21:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-28 21:20 [PATCH] linux: Edit cel-linux.yaml cel
2024-06-29 21:29 ` Chuck Lever
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox