Re: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/

[Luis Chamberlain <mcgrof@kernel.org>]

On Fri, Dec 08, 2023 at 10:01:32AM -0500, Jeff Layton wrote:
> diff --git a/scripts/bringup_vagrant.sh b/scripts/bringup_vagrant.sh
> index ad19d2980e4e..0ebcd4b3f4ba 100755
> --- a/scripts/bringup_vagrant.sh
> +++ b/scripts/bringup_vagrant.sh
> @@ -23,10 +23,10 @@ get_canonical_version()
>  _vagrant_lacks_parallel()
>  {
>  	PARALLEL_MISSING="0.7.0"
> -	VAGRANT_LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
> +	LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"

This is a check which runs a vagrant command to check the plugin version
for libvirt and so I think it is properly named already there.

>  	OLD=$(get_canonical_version $PARALLEL_MISSING)
> -	CURRENT=$(get_canonical_version $VAGRANT_LIBVIRT_VERSION)
> +	CURRENT=$(get_canonical_version $LIBVIRT_VERSION)
>  	if [[ "$CURRENT" -le "$OLD" ]]; then
>  		return 1
>  	fi

So these first two hunks can be reverted.

> @@ -57,7 +57,7 @@ vagrant_check_dups()
>  
>  			kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
>  			# For libvirt we can do one more global sanity check
> -			if [[ "$CONFIG_VAGRANT_LIBVIRT" == "y" ]]; then
> +			if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
>  				possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
>  				if [[ -f $possible_image ]]; then
>  					echo "Image for instance $instance already exists ($possible_image), skippin bringup wipe of spare drives ..."

This one is using the config stuff so the rename is good.

> diff --git a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config

<-- etc -->

I don't think we should have to change these for two reasons:

  * they are present to allow folks to reproduce, folks who want to
    reproduce can look a the top of the file and git reset kdevops to
    the version specified.
  * It would incur a huge burdon on us to do this every time we want to
    do a new rename

The rest looks good to me!

  Luis