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 CDA351C17 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=anFkIJzgBRoWhCTKVdHFK16TGj+mcM4ko2zeNHwnNmEZs4piQrlagkXkQQhdrIB59Kr4mGjS+biOpkj5mh35c0JzLdhfLwWn//9lc0d1E0SjvaTG8SxOoq/j58swagTVQPeieqOd0+88lPL8OTNpMvskajHlTzWSDyTGx8bIPeo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765544; c=relaxed/simple; bh=nt1bpdCDgdQgTbY+w0LyKCGiLVh0QqgZfygNeUnERjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jaa93Tp33/Dm3NMioqUDsUmbu80KecZUs19pjrxRbsW4GuH1IR5g+MtOhpphOnrlgPwqDXsGtCRFB1psSRyhTaRFNYenzLH0GesFqrswi61Eo8noVfOl1/Czw8rRb4HenWss9bjw3j5/5kePwX4AXctRkfQAAXUGF0ipUjQfiWI= 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=p36F8BJI; 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="p36F8BJI" 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=uPWIbNQTCGPwHWt990eNlY2JCmKVnHD7M/6bHdjFwgo=; b=p36F8BJIAVFJnoIeos/uDhDHJ/ K3xNSZ+Pd3PdnmW0+f9D0fVrcbF3u9LyYFaNHR2IqlOkJjiSSyFCNb7NrUejh7j878VS1zerObwTc 7Gu9QkqySxjyAi/TDAFkW8gtAjIOEint37R4MYOA16fNUOqcpASUTbncdvaTB5Wy6aFeM9UccRQb7 SjnMmtawFEDyltXFbov8gQLecc9IAa6WLJq0NmdkbN869T6rOglOWNO6wOquKP83JGpxSdiZdG31h DDmEf5l31dmBugm03rSNgVkpABaxwtU8dUkMBfAp8lKLuI/VOr4WAUAT8E3fVZAJ2Dmet6BvBIVxc CzCni6gw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPe-00000002ZLa-0SCt; Sat, 30 Mar 2024 02:25:42 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 09/18] mirrors: use kdevops fstests mirror when available Date: Fri, 29 Mar 2024 19:25:31 -0700 Message-ID: <20240330022540.612487-10-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 now extends support to use the kdevops specific mirror of fstests if its present. Now, with today's defaults you will end up using mirroring for both kdevops and fstests when you enable the fstests workflow if a mirror was found for each one on your system: grep git extra_vars.yaml | grep git kdevops_git: git://192.168.122.1/mirror/kdevops.git kdevops_git_version: HEAD fstests_git: git://192.168.122.1/mirror/kdevops/fstests.git fstests_git_version: HEAD Signed-off-by: Luis Chamberlain --- workflows/fstests/Kconfig | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/workflows/fstests/Kconfig b/workflows/fstests/Kconfig index 4b22be71c805..c797b2491d5a 100644 --- a/workflows/fstests/Kconfig +++ b/workflows/fstests/Kconfig @@ -280,13 +280,20 @@ config HAVE_MIRROR_FSTESTS depends on USE_LIBVIRT_MIRROR default $(shell, scripts/check_mirror_present.sh /mirror/fstests.git) +config HAVE_MIRROR_KDEVOPS_FSTESTS + bool + depends on USE_LIBVIRT_MIRROR + default $(shell, scripts/check_mirror_present.sh /mirror/kdevops/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 && !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/linux-kdevops/fstests.git" if GIT_LINUX_KDEVOPS_GITHUB && !HAVE_MIRROR_KDEVOPS_FSTESTS + default "https://gitlab.com/linux-kdevops/fstests.git" if GIT_LINUX_KDEVOPS_GITLAB && !HAVE_MIRROR_KDEVOPS_FSTESTS + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/kdevops/fstests.git) if GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/kdevops/fstests.git) if GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && GUESTFS default "https://github.com/btrfs/fstests.git" if FSTESTS_BTRFS help The fstests git tree to clone. -- 2.43.0