[PATCH 16/18] mirrors: add xfsdump mirror and use it

[Luis Chamberlain <mcgrof@kernel.org>]

Now that we have an easy way to support mirrors, let's just
add xfsdump in one shot and enable it too.

Note: only debian uses this git tree.

We check that we get the right URL when XFS is enabled and the
mirror has been cloned:

grep dump extra_vars.yaml
fstests_xsfsdump_git: git://192.168.122.1/mirror/xfsdump-dev.git

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 Makefile.linux-mirror                                 |  1 +
 kconfigs/Kconfig.defaults                             |  7 +++++++
 playbooks/roles/fstests/defaults/main.yml             |  2 ++
 .../roles/fstests/tasks/install-deps/debian/main.yml  |  2 +-
 playbooks/roles/linux-mirror/defaults/main.yml        |  1 +
 .../roles/linux-mirror/templates/mirrors.yaml.j2      |  3 +++
 workflows/fstests/Makefile.xfs                        |  2 ++
 workflows/fstests/xfs/Kconfig                         | 11 +++++++++++
 8 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror
index d9515353f77b..67bb463da53e 100644
--- a/Makefile.linux-mirror
+++ b/Makefile.linux-mirror
@@ -4,6 +4,7 @@ ifeq (y,$(CONFIG_INSTALL_LOCAL_LINUX_MIRROR))
 LINUX_MIRROR_ARGS :=
 LINUX_MIRROR_ARGS += install_linux_mirror=True
 LINUX_MIRROR_ARGS += defaults_xfsprogs_git='$(subst ",,$(CONFIG_DEFAULT_XFSPROGS_URL))'
+LINUX_MIRROR_ARGS += defaults_xfsdump_git='$(subst ",,$(CONFIG_DEFAULT_XFSDUMP_URL))'
 
 MIRROR_CODE      := $(TOPDIR)/playbooks/roles/linux-mirror/linux-mirror-systemd/
 
diff --git a/kconfigs/Kconfig.defaults b/kconfigs/Kconfig.defaults
index ba5d6a3a78d6..e559f28f964d 100644
--- a/kconfigs/Kconfig.defaults
+++ b/kconfigs/Kconfig.defaults
@@ -1,3 +1,10 @@
+# Please keep in alphabetical order
+
+config DEFAULT_XFSDUMP_URL
+	string
+	default "https://github.com/linux-kdevops/xfsdump-dev.git"
+
 config DEFAULT_XFSPROGS_URL
 	string
 	default "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"
+
diff --git a/playbooks/roles/fstests/defaults/main.yml b/playbooks/roles/fstests/defaults/main.yml
index a46a4672dfa5..c3df0da2718a 100644
--- a/playbooks/roles/fstests/defaults/main.yml
+++ b/playbooks/roles/fstests/defaults/main.yml
@@ -184,3 +184,5 @@ fstests_tmpfs_section_huge_within_size: False
 fstests_tmpfs_section_huge_advise: False
 
 devconfig_enable_systemd_journal_remote: False
+
+fstests_xsfsdump_git: "https://github.com/linux-kdevops/xfsdump-dev.git"
diff --git a/playbooks/roles/fstests/tasks/install-deps/debian/main.yml b/playbooks/roles/fstests/tasks/install-deps/debian/main.yml
index 1b00b88cb5fd..d806cd678818 100644
--- a/playbooks/roles/fstests/tasks/install-deps/debian/main.yml
+++ b/playbooks/roles/fstests/tasks/install-deps/debian/main.yml
@@ -94,7 +94,7 @@
 # in Debian Testing repository
 - name: git clone xfsdump
   git:
-    repo: "https://github.com/linux-kdevops/xfsdump-dev.git"
+    repo: "{{ fstests_xsfsdump_git }}"
     dest: "{{ data_path }}/xfsdump"
     update: yes
     version: v3.1.10-fixed
diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml
index 19ae271e4edc..461f47cfedf9 100644
--- a/playbooks/roles/linux-mirror/defaults/main.yml
+++ b/playbooks/roles/linux-mirror/defaults/main.yml
@@ -3,3 +3,4 @@
 mirror_user_system_dir: "~/.config/systemd/user/"
 install_linux_mirror:  False
 defaults_xfsprogs_git: "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"
+defaults_xfsdump_git: "https://github.com/linux-kdevops/xfsdump-dev.git"
diff --git a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
index 7151873783d0..2f0267c27c7b 100644
--- a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
+++ b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
@@ -2,3 +2,6 @@ mirrors:
   - short_name: "xfsprogs"
     url: "{{ defaults_xfsprogs_git }}"
     target: "xfsprogs-dev.git"
+  - short_name: "xfsdump"
+    url: "{{ defaults_xfsdump_git }}"
+    target: "xfsdump-dev.git"
diff --git a/workflows/fstests/Makefile.xfs b/workflows/fstests/Makefile.xfs
index 54194f243876..542946e12f9c 100644
--- a/workflows/fstests/Makefile.xfs
+++ b/workflows/fstests/Makefile.xfs
@@ -6,6 +6,8 @@ FSTESTS_ARGS += fstests_xfs_xfsprogs_data='$(CONFIG_FSTESTS_XFS_XFSPROGS_DATA)'
 FSTESTS_ARGS += fstests_xfs_xfsprogs_install_path='$(CONFIG_FSTESTS_XFS_XFSPROGS_INSTALL_PATH)'
 endif
 
+FSTESTS_ARGS += fstests_xsfsdump_git='$(subst ",,$(CONFIG_FSTESTS_XFSDUMP_GIT_URL))'
+
 ifeq (y,$(CONFIG_FSTESTS_XFS_QUOTA_ENABLED))
 FSTESTS_ARGS += fstests_xfs_mount_quota_opts='$(CONFIG_FSTESTS_XFS_MOUNT_QUOTA_OPTS)'
 endif
diff --git a/workflows/fstests/xfs/Kconfig b/workflows/fstests/xfs/Kconfig
index b638d1097656..9bc787f28896 100644
--- a/workflows/fstests/xfs/Kconfig
+++ b/workflows/fstests/xfs/Kconfig
@@ -68,6 +68,17 @@ config FSTESTS_XFS_XFSPROGS_INSTALL_PATH
 	help
 	  Destination path to install Xfsprogs binaries
 
+config HAVE_MIRROR_XFSDUMP
+       bool
+       depends on USE_LIBVIRT_MIRROR
+       default $(shell, scripts/check_mirror_present.sh /mirror/xfsdump-dev.git)
+
+config FSTESTS_XFSDUMP_GIT_URL
+	string
+	default DEFAULT_XFSDUMP_URL if !HAVE_MIRROR_XFSDUMP
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/xfsdump-dev.git) if HAVE_MIRROR_XFSDUMP && VAGRANT
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/xfsdump-dev.git) if HAVE_MIRROR_XFSDUMP && GUESTFS
+
 config FSTESTS_XFS_QUOTA_ENABLED
 	bool "Enable XFS quota"
 	default n
-- 
2.43.0