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

[Luis Chamberlain <mcgrof@kernel.org>]

Now that adding mirrors is rather easier than before add the
mirror for blktrace.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 kconfigs/Kconfig.defaults                              | 4 ++++
 playbooks/roles/linux-mirror/defaults/main.yml         | 1 +
 playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 | 3 +++
 workflows/blktests/Kconfig                             | 9 ++++++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/kconfigs/Kconfig.defaults b/kconfigs/Kconfig.defaults
index d552735bdb3b..b52ec86127d0 100644
--- a/kconfigs/Kconfig.defaults
+++ b/kconfigs/Kconfig.defaults
@@ -1,5 +1,9 @@
 # Please keep in alphabetical order
 
+config DEFAULT_BLKTRACE_URL
+	string
+	default "https://git.kernel.dk/blktrace"
+
 config DEFAULT_DBENCH_URL
 	string
 	default "https://github.com/linux-kdevops/dbench.git"
diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml
index e0788bb43c94..7c0d7bf623f2 100644
--- a/playbooks/roles/linux-mirror/defaults/main.yml
+++ b/playbooks/roles/linux-mirror/defaults/main.yml
@@ -5,3 +5,4 @@ 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"
 defaults_dbench_git: "https://github.com/linux-kdevops/dbench.git"
+defaults_blktrace_git: "https://git.kernel.dk/blktrace"
diff --git a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
index 0389f3d76396..c85700738a14 100644
--- a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
+++ b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
@@ -8,3 +8,6 @@ mirrors:
   - short_name: "dbench"
     url: "{{ defaults_dbench_git }}"
     target: "dbench.git"
+  - short_name: "blktrace"
+    url: "{{ defaults_blktrace_git }}"
+    target: "blktrace.git"
diff --git a/workflows/blktests/Kconfig b/workflows/blktests/Kconfig
index 05e16bcf79cd..998939d137f9 100644
--- a/workflows/blktests/Kconfig
+++ b/workflows/blktests/Kconfig
@@ -159,9 +159,16 @@ config BLKTESTS_DATA
 	  Note that {{data_path}} corresponds to the location set by the
 	  configuration option CONFIG_WORKFLOW_DATA_PATH.
 
+config HAVE_MIRROR_BLKTRACE
+	bool
+	depends on USE_LIBVIRT_MIRROR
+	default $(shell, scripts/check_mirror_present.sh /mirror/blktrace.git)
+
 config BLKTRACE_GIT
 	string "The blktrace git tree to clone"
-	default "https://git.kernel.dk/blktrace"
+	default DEFAULT_BLKTRACE_URL if !HAVE_MIRROR_BLKTRACE
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && VAGRANT
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && GUESTFS
 	help
 	  The blktrace git tree to clone.
 
-- 
2.43.0