From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 06/18] mirrors: add fstests to mirrors
Date: Fri, 29 Mar 2024 19:25:28 -0700 [thread overview]
Message-ID: <20240330022540.612487-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20240330022540.612487-1-mcgrof@kernel.org>
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 <mcgrof@kernel.org>
---
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
next prev parent reply other threads:[~2024-03-30 2:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-30 2:25 [PATCH 00/18] mirrors: enhance and add tons of mirrors Luis Chamberlain
2024-03-30 2:25 ` [PATCH 01/18] linux-mirror: add kdevops mirroring support Luis Chamberlain
2024-03-30 2:25 ` [PATCH 02/18] Makefile.min_deps: add netcat as a min binary dependency Luis Chamberlain
2024-03-30 2:25 ` [PATCH 03/18] provision: generalize bridge-ip further Luis Chamberlain
2024-03-30 2:25 ` [PATCH 04/18] mirrors: add guestfs mirror options without 9p Luis Chamberlain
2024-03-30 2:25 ` [PATCH 05/18] mirrors: enable kdevops mirror Luis Chamberlain
2024-03-30 2:25 ` Luis Chamberlain [this message]
2024-03-30 2:25 ` [PATCH 07/18] fstests: use local primary fstests mirror if present Luis Chamberlain
2024-03-30 2:25 ` [PATCH 08/18] mirrors: add kdevops git alternative for fstests Luis Chamberlain
2024-03-30 2:25 ` [PATCH 09/18] mirrors: use kdevops fstests mirror when available Luis Chamberlain
2024-03-30 2:25 ` [PATCH 10/18] mirrors: add blktests mirror Luis Chamberlain
2024-03-30 2:25 ` [PATCH 11/18] mirrors: use blktests mirror when its available Luis Chamberlain
2024-03-30 2:25 ` [PATCH 12/18] mirrors: increase scope of mirroring in output Luis Chamberlain
2024-03-30 2:25 ` [PATCH 13/18] mirrors: move status check Luis Chamberlain
2024-03-30 2:25 ` [PATCH 14/18] mirrors: move mirror editing into one file Luis Chamberlain
2024-03-30 2:25 ` [PATCH 15/18] mirrors: add new mirrors.yaml and add xfsprogs Luis Chamberlain
2024-03-30 2:25 ` [PATCH 16/18] mirrors: add xfsdump mirror and use it Luis Chamberlain
2024-03-30 2:25 ` [PATCH 17/18] mirrors: add dbench git Luis Chamberlain
2024-03-30 2:25 ` [PATCH 18/18] mirrors: add blktrace mirror and use it Luis Chamberlain
2024-03-30 16:37 ` [PATCH 00/18] mirrors: enhance and add tons of mirrors Chuck Lever III
2024-04-03 1:01 ` Luis Chamberlain
2024-04-03 18:04 ` Chuck Lever III
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240330022540.612487-7-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox