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 CC3FE187F 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=1711765544; cv=none; b=VT8zmjDcWfNlHbGH7S4OWyMnGCzV9Im++IG7S76zgl0eDYV+SvahmEodAa+SGkiZS4aq4j/iWHm1kT6rLbMG5OjgFsXxVKuL1xNIb/QjwxbAkdtAZv4+YJPsvumeMjXNqpKh6gooDdX1bUxzXD8QH745mMEhVRZYkEJj9cRpL0I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765544; c=relaxed/simple; bh=GW2Hqiu3v6O5tKO9Af+/SVrXPKP7g9Y+fgAQScd0vVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DuxG+cVtZXtyeM7Xj04QahdudqSt95TZbhVTb3e44wxXG8ZGSAEJHfR7efrOl/rNzJo5Y8zuh1Q1hC0TTYfw7H4uI4LZS03sy+F2u93KU1q42fmS7ORP5oIKqTcyIowHZVmBHdG4dFVuAhbfUoB3ixrAEDeYX0mB7hjm/ESCi5M= 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=Smo5op1A; 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="Smo5op1A" 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=JqB1srnpphjVoutMw4j7YJyaHbKF4W9qfwRgZAUPaK8=; b=Smo5op1A3ug6fai25tw9afnmbo JcY29KrSpNGNpdFpfMn3FSF8AHhTAvTz8aK9QaMCrc8f40mtwUiLPhvXom/OpV0AKYtBwjQDrnoR+ qeO39Pv7vvlIRthJIg/QtZRPI2s2tkWvhskXrOkN/TBip3ShoChwpwmknTkh3oow36dhwZr5WRaZP 8wfXhbwNh+bVP6SCptJDZN+u+xr3g2LFrGaFm6SrbjYLFU2tQ+vcAseJqTpeFGgm+HDRNFmgDWsIe aZLEzKg/RZgYNXO9HdIZ+jsHZnQhFGotxGtgZ9/4Qjbzz0HRq47Q6aYf4Yi91CkvBn2NFeiDQiVGd ApTLssbw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPd-00000002ZLS-48eA; Sat, 30 Mar 2024 02:25:41 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 07/18] fstests: use local primary fstests mirror if present Date: Fri, 29 Mar 2024 19:25:29 -0700 Message-ID: <20240330022540.612487-8-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 There are two ways to use tools: a) primary upstream b) alternatives The b) alternatives were implemented in kdeovps using CONFIG_GIT_ALTERNATIVES so to allow us to enable reproducible build environments, letting you keep forks of the primary source tree. In practice for fstest that means kdevops has its own fstests git tree under the kdevops organization, in case that is desirable. That is actually the default, so to avoid issues with using the latest upstream fstests tree. This change is when you use a) the primary upstream tree. So when you disable CONFIG_GIT_ALTERNATIVES, we now end up using the local mirror if you have it present: grep fstests_git extra_vars.yaml fstests_git: git://192.168.122.1/mirror/fstests.git Note that today's default is with CONFIG_GIT_ALTERNATIVES enabled. We'll be addressing this later after we first add mirroring support for kdevops's own fork of fstests. Signed-off-by: Luis Chamberlain --- workflows/fstests/Kconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/workflows/fstests/Kconfig b/workflows/fstests/Kconfig index d65df7f0ecfa..4b22be71c805 100644 --- a/workflows/fstests/Kconfig +++ b/workflows/fstests/Kconfig @@ -275,9 +275,16 @@ endmenu endif # FSTESTS_TMPFS +config HAVE_MIRROR_FSTESTS + bool + depends on USE_LIBVIRT_MIRROR + default $(shell, scripts/check_mirror_present.sh /mirror/fstests.git) + config FSTESTS_GIT string "The fstests git tree to clone" - default "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git" if !GIT_ALTERNATIVES + default "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git" if !GIT_ALTERNATIVES && !HAVE_MIRROR_FSTESTS + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && GUESTFS default "https://github.com/linux-kdevops/fstests.git" if GIT_LINUX_KDEVOPS_GITHUB default "https://gitlab.com/linux-kdevops/fstests.git" if GIT_LINUX_KDEVOPS_GITLAB default "https://github.com/btrfs/fstests.git" if FSTESTS_BTRFS -- 2.43.0