From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 312CD1C3D for ; Sat, 30 Mar 2024 02:25:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; cv=none; b=nYUUuGkcevhPAK2uV9K4OOtpd9ngiAjX4VpnYbikO7zyGttG3+FSvoS8EUezEO78WTSBL8dtszGEYRXHH9b101r2T7e6ZJCgcp+/JdOMwCKghC5bLmLgDs8Sl4DTkO1QTSQi7N7pdLrN/W0DPTc/sbnE7UdezVkTUTu2nhgZmvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; c=relaxed/simple; bh=E049hTQpSIblw9qLp4ecKVh1jQ2oIuihbI9QLic66Qc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UUCbXzYYvsPRZDLpoX0SwYcdSIsHRQzLaS8OzQKZ4yMYef81u2c5KL/TfSmqUMzwHlwbhuVcC/8UzUWK3OyL9hL7+a8AFDZjA/7ipTvX44mJdFigKqGP2GVWXOB6W/zYbK1TeBrZmbldUun32c+pfDvyXZUdM36JHJkAFmjLLos= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=whcwx/G/; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="whcwx/G/" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=6oGRgDOJCYSPCzUJfYTx4fjqVnn+eiWyDTE/6LNzomk=; b=whcwx/G/qbhvtXc76+6znca7bF k5M9HjRD8m/1sMZYYGwyonvhG6ssEBOiZ8lGURqDSFoK307pxXKAmCSf9A7AKs6U+nDM3nfrUL7c2 95FUzeu0wgWoIk8II9fLzOfcinX2681PReay2rr4pUq1DgSSVLaqm2dzBdXCnv4V2DTFfRnTNDfvJ I4YqPCqSyGAGHLAdt3ryTqIcksITQztVoJDPZK3+Br1lNTiilCZnPcMk3GSEFSSj/R+V2IfJSl+1i NybgN+X3FqRNTmDigERqM+l8HQW+9Pr7l6JCUcGqNO3dj7BYQjdlZaqVPVuu387Ztse2i59PAuULf +YEBSC9A==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPe-00000002ZLe-0pHK; Sat, 30 Mar 2024 02:25:42 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 10/18] mirrors: add blktests mirror Date: Fri, 29 Mar 2024 19:25:32 -0700 Message-ID: <20240330022540.612487-11-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240330022540.612487-1-mcgrof@kernel.org> References: <20240330022540.612487-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain 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 --- 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