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 9A86E1877 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=1711765546; cv=none; b=hQRuHqrSd0Cwz++5lOku14YiU0v2ny1M0DmqW90lGkKFdtIATtiPkx+eZcf3Dw35hleKDl0IkXuO83zroEkggDdxD6+jS41wDOw6nGuA0P7xRe8s/CPAHhouhy4FEPlbXdexKbzBVm2SdBFfYM5Mf1cf0JSQ0770Zq8ag/McwZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765546; c=relaxed/simple; bh=jnoX+ayrH/JySpC5wn09B5wA4shjHZj2VVRY+Q/0kZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N9nAJNKOAm3m0GHWnoLJaPvdNOOLx3cGOXsISqWWK2BxrKc7L1pTXpTLRBZGxsj0lnN7xD8n8WvBTlZD62CgQDRqOjxSDawt71Sfd4ipbEZ5NEwYhc+2v5EnhoyNe3Zp+nXlN1SLmbmM1a0FN7KYLaONYx9yZbroMZafz5tHORY= 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=RKjchBgs; 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="RKjchBgs" 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=B8GcBLO62hnjG1Mr+Ghg3h5dGd07fCWbE7T1YaI0RlQ=; b=RKjchBgs1a1ZRH58osqtZcHnZ8 ib0O2+HDhBgQNX8iueh1DG1cz8nn0SpyNePTmbLAYXoDFcUWDYwrvXKla1HbMMk6VznmrGqmNIro/ FAE5P3vmUHr8ZVKZCehdqM/aeEqn/xdUJGsFLodDBAz8uOL2LHWwA3D0oY+7SGufLmL05YpejjKIb 3GshFdnIyNgR8rm9LdgegAOodNo536L8MsSiIQ0My9DcQo2d53NuC/TnNmntkFAkgbxIpu28uBhWM KEx4dkogLhNM4f3sHJ+DG0sECOsd/C0LNlTsCmb+yWlFxsAZEplKNKjtqdW1/cEV9MGkb9dGXWTQJ +uhGTxNw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPd-00000002ZLO-3qoN; Sat, 30 Mar 2024 02:25:41 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 06/18] mirrors: add fstests to mirrors Date: Fri, 29 Mar 2024 19:25:28 -0700 Message-ID: <20240330022540.612487-7-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 The fstests workflow relies on fstests, so mirror that as well. This is the first general tool we are mirroring, we will make of use of it next in the subsequent patch. We update this tree every 6 hours. Signed-off-by: Luis Chamberlain --- Makefile.linux-mirror | 1 + kconfigs/Kconfig.mirror | 44 ++++++++++++++++++- .../linux-mirror-systemd/Makefile | 10 +++++ .../fstests-mirror.service | 13 ++++++ .../linux-mirror-systemd/fstests-mirror.timer | 11 +++++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.service create mode 100644 playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.timer diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror index 762e53562493..d6b0c848eaeb 100644 --- a/Makefile.linux-mirror +++ b/Makefile.linux-mirror @@ -61,3 +61,4 @@ export MCGROF_LINUS := $(subst ",,$(CONFIG_MIRROR_MCGROF_LINUS_URL)) export QEMU := $(subst ",,$(CONFIG_MIRROR_QEMU_URL)) export QEMU_JIC23 := $(subst ",,$(CONFIG_MIRROR_QEMU_JIC23_URL)) export KDEVOPS := $(subst ",,$(CONFIG_MIRROR_KDEVOPS_URL)) +export FSTESTS := $(subst ",,$(CONFIG_MIRROR_FSTESTS_URL)) diff --git a/kconfigs/Kconfig.mirror b/kconfigs/Kconfig.mirror index 0cdce1566a8b..fa5ec8c1333f 100644 --- a/kconfigs/Kconfig.mirror +++ b/kconfigs/Kconfig.mirror @@ -45,6 +45,9 @@ config INSTALL_LOCAL_LINUX_MIRROR kdevops specific trees and kdevops git alternatives: /mirror/kdevops.git + Tools: + /mirror/fstests.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 setup. You can however safely also disable this option after your @@ -387,5 +390,44 @@ config MIRROR_QEMU_JIC23_URL default "https://gitlab.com/jic23/qemu.git" if MIRROR_QEMU_JIC23_HTTPS_GITLAB default "ssh://git@gitlab.com:jic23/qemu.git" if MIRROR_QEMU_JIC23_SSH_GITLAB -endif +choice + prompt "Tools - xfstests-dev.git mirror protocol/source" + default MIRROR_FSTESTS_GIT if MIRROR_GIT_WORKS + default MIRROR_FSTESTS_HTTPS if !MIRROR_GIT_WORKS + depends on INSTALL_LOCAL_LINUX_MIRROR + +config MIRROR_FSTESTS_GIT + bool "Git" + depends on MIRROR_GIT_WORKS + help + If you enable this option then git:// protocol will be used as the + source of the mirror. The URL is: + + git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git + +config MIRROR_FSTESTS_HTTPS + bool "HTTPS" + help + If you enable this option then GitLab HTTPS will be used as the + source of the mirror. The URL is: + + https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git + +config MIRROR_FSTESTS_HTTPS_GOOGLE + bool "HTTPS (Google)" + help + If you enable this option then Google HTTPS will be used as the source + of the mirror. The URL is: + + https://kernel.googlesource.com/pub/scm/fs/xfs/xfstests-dev.git + +endchoice + +config MIRROR_FSTESTS_URL + string + default "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git" if MIRROR_FSTESTS_GIT + default "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git" if MIRROR_FSTESTS_HTTPS + default "https://kernel.googlesource.com/pub/scm/fs/xfs/xfstests-dev.git" if MIRROR_FSTESTS_HTTPS_GOOGLE + +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 5568d870c6bc..7de8cc4e326d 100644 --- a/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile +++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/Makefile @@ -18,6 +18,9 @@ LINUX_TIMERS += mcgrof-linus-mirror.timer KDEVOPS_SERVICES := kdevops-mirror.service KDEVOPS_TIMERS := kdevops-mirror.timer +TOOLS_SERVICES := fstests-mirror.service +TOOLS_TIMERS := fstests-mirror.timer + QEMU_SERVICES := qemu-mirror.service QEMU_SERVICES += qemu-jic23-mirror.service QEMU_TIMERS := qemu-mirror.timer @@ -36,14 +39,17 @@ MCGROF_TARGET := $(MIRROR_PATH)/mcgrof-next.git QEMU_TARGET := $(MIRROR_PATH)/qemu.git QEMU_JIC23_TARGET := $(MIRROR_PATH)/qemu-jic23.git KDEVOPS_TARGET := $(MIRROR_PATH)/kdevops.git +FSTESTS_TARGET := $(MIRROR_PATH)/fstests.git MIRROR_SERVICES := $(LINUX_SERVICES) MIRROR_SERVICES += $(QEMU_SERVICES) MIRROR_SERVICES += $(KDEVOPS_SERVICES) +MIRROR_SERVICES += $(TOOLS_SERVICES) MIRROR_TIMERS := $(LINUX_TIMERS) MIRROR_TIMERS += $(QEMU_TIMERS) MIRROR_TIMERS += $(KDEVOPS_TIMERS) +MIRROR_TIMERS += $(TOOLS_TIMERS) ifeq ($(V),1) export Q= @@ -106,6 +112,10 @@ mirror: echo " CLONE linux-kdevops/kdevops" ;\ git -C $(MIRROR_PATH) clone $(GIT_VERBOSE) --progress --mirror $(KDEVOPS) $(KDEVOPS_TARGET) ;\ fi + $(Q)if [ ! -d $(FSTESTS_TARGET) ]; then \ + echo " CLONE fstests" ;\ + git -C $(MIRROR_PATH) clone $(GIT_VERBOSE) --progress --mirror $(FSTESTS) $(FSTESTS_TARGET) ;\ + fi install: $(Q)mkdir -p $(USER_SYSTEM) diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.service b/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.service new file mode 100644 index 000000000000..31ce3e7552e9 --- /dev/null +++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.service @@ -0,0 +1,13 @@ +[Unit] +Description=fstests mirror [fstests.git] +Documentation=man:git(1) +ConditionPathExists=/mirror/fstests.git + +[Service] +Type=oneshot +ExecStartPre=/usr/bin/git -C /mirror/fstests.git remote update --prune +ExecStart=/usr/bin/git -C /mirror/fstests.git fetch --tags --prune +ExecStartPost=/usr/bin/git -C /mirror/fstests.git fetch origin +refs/heads/*:refs/heads/* + +[Install] +WantedBy=multi-user.target diff --git a/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.timer b/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.timer new file mode 100644 index 000000000000..0a69f2f55897 --- /dev/null +++ b/playbooks/roles/linux-mirror/linux-mirror-systemd/fstests-mirror.timer @@ -0,0 +1,11 @@ +[Unit] +Description=fstests mirror query timer [fstests.git] +ConditionPathExists=/mirror/fstests.git + +[Timer] +OnBootSec=10m +# Every 6 hours +OnUnitInactiveSec=360m + +[Install] +WantedBy=default.target -- 2.43.0