[PATCH 17/18] mirrors: add dbench git

[Luis Chamberlain <mcgrof@kernel.org>]

We're actually the main source of the latest dbench so just use that.

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

diff --git a/kconfigs/Kconfig.defaults b/kconfigs/Kconfig.defaults
index e559f28f964d..d552735bdb3b 100644
--- a/kconfigs/Kconfig.defaults
+++ b/kconfigs/Kconfig.defaults
@@ -1,5 +1,9 @@
 # Please keep in alphabetical order
 
+config DEFAULT_DBENCH_URL
+	string
+	default "https://github.com/linux-kdevops/dbench.git"
+
 config DEFAULT_XFSDUMP_URL
 	string
 	default "https://github.com/linux-kdevops/xfsdump-dev.git"
diff --git a/playbooks/roles/blktests/defaults/main.yml b/playbooks/roles/blktests/defaults/main.yml
index dd009f58b3a3..8c50bf6d8e63 100644
--- a/playbooks/roles/blktests/defaults/main.yml
+++ b/playbooks/roles/blktests/defaults/main.yml
@@ -22,3 +22,4 @@ nbd_version: "nbd-3.21"
 nbd_data: "{{data_path}}/nbd"
 
 compile_dbench: False
+blktests_dbench_git: "https://github.com/linux-kdevops/dbench.git"
diff --git a/playbooks/roles/blktests/tasks/main.yml b/playbooks/roles/blktests/tasks/main.yml
index fd4943b36088..590f981af0b8 100644
--- a/playbooks/roles/blktests/tasks/main.yml
+++ b/playbooks/roles/blktests/tasks/main.yml
@@ -42,7 +42,7 @@
     name: compile_dbench
   vars:
     dbench_data: "{{ data_path }}/dbench"
-    dbench_git: "https://github.com/linux-kdevops/dbench.git"
+    dbench_git: "{{ blktests_dbench_git }}"
   tags: [ 'oscheck', 'git', 'dbench']
 
 - name: Remove any old blktrace as we always clone a fresh tree
diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml
index 461f47cfedf9..e0788bb43c94 100644
--- a/playbooks/roles/linux-mirror/defaults/main.yml
+++ b/playbooks/roles/linux-mirror/defaults/main.yml
@@ -4,3 +4,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"
+defaults_dbench_git: "https://github.com/linux-kdevops/dbench.git"
diff --git a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
index 2f0267c27c7b..0389f3d76396 100644
--- a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
+++ b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2
@@ -5,3 +5,6 @@ mirrors:
   - short_name: "xfsdump"
     url: "{{ defaults_xfsdump_git }}"
     target: "xfsdump-dev.git"
+  - short_name: "dbench"
+    url: "{{ defaults_dbench_git }}"
+    target: "dbench.git"
diff --git a/workflows/blktests/Kconfig b/workflows/blktests/Kconfig
index 2be13de90a76..05e16bcf79cd 100644
--- a/workflows/blktests/Kconfig
+++ b/workflows/blktests/Kconfig
@@ -12,6 +12,17 @@ config HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG_RESET
 	bool
 	default n
 
+config HAVE_MIRROR_DBENCH
+	bool
+	depends on USE_LIBVIRT_MIRROR
+	default $(shell, scripts/check_mirror_present.sh /mirror/dbench.git)
+
+config BLKTESTS_DBENCH_GIT_URL
+	string
+	default DEFAULT_DBENCH_URL if !HAVE_MIRROR_DBENCH
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && VAGRANT
+	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && GUESTFS
+
 config BLKTESTS_WATCHDOG
 	bool "Enable kdevops blktests watchdog"
 	default y if HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG
diff --git a/workflows/blktests/Makefile b/workflows/blktests/Makefile
index 829694af8bd3..ac4e8c2d1831 100644
--- a/workflows/blktests/Makefile
+++ b/workflows/blktests/Makefile
@@ -27,6 +27,7 @@ NBD_DATA:=$(subst ",,$(CONFIG_NBD_DATA))
 
 BLKTESTS_DATA_TARGET:=$(subst ",,$(CONFIG_BLKTESTS_DATA_TARGET))
 
+BLKTESTS_ARGS += blktests_dbench_git='$(subst ",,$(CONFIG_BLKTESTS_DBENCH_GIT_URL))'
 BLKTESTS_ARGS += blktests_git='$(BLKTESTS_GIT)'
 BLKTESTS_ARGS += blktests_data=\"$(BLKTESTS_DATA)\"
 
-- 
2.43.0