[PATCH 10/18] mirrors: add blktests mirror

[Luis Chamberlain <mcgrof@kernel.org>]

This adds mirroring for blktests. Only Omar's tree exists, which
means a new mirror is desirable in the future.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 Makefile.linux-mirror                               |  1 +
 kconfigs/Kconfig.mirror                             |  5 +++++
 .../linux-mirror/linux-mirror-systemd/Makefile      |  7 +++++++
 .../linux-mirror-systemd/blktests-mirror.service    | 13 +++++++++++++
 .../linux-mirror-systemd/blktests-mirror.timer      | 11 +++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.service
 create mode 100644 playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.timer

diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror
index f6cc1b447eb8..ebaf505a7627 100644
--- a/Makefile.linux-mirror
+++ b/Makefile.linux-mirror
@@ -63,3 +63,4 @@ export QEMU_JIC23	:= $(subst ",,$(CONFIG_MIRROR_QEMU_JIC23_URL))
 export KDEVOPS		:= $(subst ",,$(CONFIG_MIRROR_KDEVOPS_URL))
 export FSTESTS		:= $(subst ",,$(CONFIG_MIRROR_FSTESTS_URL))
 export KDEVOPS_FSTESTS	:= $(subst ",,$(CONFIG_MIRROR_KDEVOPS_FSTESTS_URL))
+export BLKTESTS		:= $(subst ",,$(CONFIG_MIRROR_BLKTESTS_URL))
diff --git a/kconfigs/Kconfig.mirror b/kconfigs/Kconfig.mirror
index 076d5d117984..7e17d59a605c 100644
--- a/kconfigs/Kconfig.mirror
+++ b/kconfigs/Kconfig.mirror
@@ -48,6 +48,7 @@ config INSTALL_LOCAL_LINUX_MIRROR
 
 	  Tools:
 	    /mirror/fstests.git
+	    /mirror/blktests.git
 
 	  Enabling this even if you already have the repositories does nothing
 	  so it is safe to keep this enabled even after your first linux-mirror
@@ -459,5 +460,9 @@ config MIRROR_KDEVOPS_FSTESTS_URL
 	default "https://github.com/linux-kdevops/fstests.git" if MIRROR_KDEVOPS_FSTESTS_HTTPS_GITHUB
 	default "https://gitlab.com/linux-kdevops/fstests.git" if MIRROR_KDEVOPS_FSTESTS_HTTPS_GITLAB
 
+config MIRROR_BLKTESTS_URL
+	string
+	default "https://github.com/osandov/blktests.git"
+
 endif # ENABLE_LOCAL_LINUX_MIRROR
 endif # TERRAFORM
diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile b/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
index 4a69ee7ca88f..9e03ebd04c97 100644
--- a/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
+++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile
@@ -20,8 +20,10 @@ KDEVOPS_TIMERS := kdevops-mirror.timer
 
 TOOLS_SERVICES  := fstests-mirror.service
 TOOLS_SERVICES  += kdevops-fstests-mirror.service
+TOOLS_SERVICES  += blktests-mirror.service
 TOOLS_TIMERS := fstests-mirror.timer
 TOOLS_TIMERS += kdevops-fstests-mirror.timer
+TOOLS_TIMERS += blktests-mirror.timer
 
 QEMU_SERVICES  := qemu-mirror.service
 QEMU_SERVICES  += qemu-jic23-mirror.service
@@ -43,6 +45,7 @@ QEMU_JIC23_TARGET	:= $(MIRROR_PATH)/qemu-jic23.git
 KDEVOPS_TARGET		:= $(MIRROR_PATH)/kdevops.git
 FSTESTS_TARGET		:= $(MIRROR_PATH)/fstests.git
 KDEVOPS_FSTESTS_TARGET	:= $(MIRROR_PATH)/kdevops/fstests.git
+BLKTESTS_TARGET		:= $(MIRROR_PATH)/blktests.git
 
 MIRROR_SERVICES := $(LINUX_SERVICES)
 MIRROR_SERVICES += $(QEMU_SERVICES)
@@ -123,6 +126,10 @@ mirror:
 	  echo "          CLONE kdevops-fstests" ;\
 	  git -C $(MIRROR_PATH) clone $(GIT_VERBOSE) --progress --mirror $(KDEVOPS_FSTESTS) --reference $(FSTESTS_TARGET) $(KDEVOPS_FSTESTS_TARGET) ;\
 	fi
+	$(Q)if [ ! -d $(BLKTESTS_TARGET) ]; then \
+	  echo "          CLONE blktests" ;\
+	  git -C $(MIRROR_PATH) clone $(GIT_VERBOSE) --progress --mirror $(BLKTESTS) $(BLKTESTS_TARGET) ;\
+	fi
 
 install:
 	$(Q)mkdir -p $(USER_SYSTEM)
diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.service b/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.service
new file mode 100644
index 000000000000..9e1f82ed32db
--- /dev/null
+++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=blktests mirror [blktest.git]
+Documentation=man:git(1)
+ConditionPathExists=/mirror/blktests.git
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/git -C /mirror/blktests.git remote update --prune
+ExecStart=/usr/bin/git -C /mirror/blktests.git fetch --tags --prune
+ExecStartPost=/usr/bin/git -C /mirror/blktests.git fetch origin +refs/heads/*:refs/heads/*
+
+[Install]
+WantedBy=multi-user.target
diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.timer b/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.timer
new file mode 100644
index 000000000000..ef2bfb1ecdba
--- /dev/null
+++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/blktests-mirror.timer
@@ -0,0 +1,11 @@
+[Unit]
+Description=blktests mirror query timer blktests.git]
+ConditionPathExists=/mirror/blktests.git
+
+[Timer]
+OnBootSec=10m
+# Every 6 hours
+OnUnitInactiveSec=360m
+
+[Install]
+WantedBy=default.target
-- 
2.43.0