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 897DB4430 for ; Sat, 30 Mar 2024 02:25:43 +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=LmjTBMAWuVdzZ4Ijl1cpQ8sbN1pm/O78yMF2jv/VVMKBQFcqBq+p9+mTIpm7SztozOzbk5RpqBf9vK8mw6A4y+8zJUa4ZQho++C8+sY616saYBGxut5RaNYzav0zoo1+OJib54PJdSZeI0LJX256TRcGNzPw4xzGfqwObw/moMg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765545; c=relaxed/simple; bh=isoN/yKI8gtQ9CiW2GbZBK/h8mAxLXHhUhBWaZfDPXA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AH142f3RqigARLXPJGkzKJs+Xi14UH31ETcgNoEow4OOQHfiIuW0eXgyn+tTG+KrKQacbRKLhBQgJe6jd0M9kGgum5bFB+HRzXJCdhxSxy2oL2gZf8Y7L0EExn7WEzUx2r/npdX6QU1C5qJY3lDx/IpN5561kJhUYfHw4dql5Tc= 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=vQUYvpVH; 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="vQUYvpVH" 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=cfy9MZ3SgjbxDGCR71743r6acaNcfDO/4a8L0VGx5ao=; b=vQUYvpVHD5WdGGpY4j7L/XI0xB q876NIaeg6t3ozyXy3kyhfnEM0w/3WGvRoFEXT03qm4CEby2CfGXsFewmkPTiUrvBJu4GGDhDihZ9 IVNbVcGxjvklWy4X3AEsIaYKo6xqI8rDPNDabmaEaW/+jYophrXtMnWnX16sGxVIeoDk1N2aKAR5t AmNafjCMA3oFrZt2TIIfKk9MablAEcv1n/jLmaq4eN2iBmMkFQZ3T2AaUsPEtZJIv/pzH+JMcKibY dunE0noy7LXhT7NxV6AhSk/hPglCu9QcILwWkP7hlugiB/SAw+QpSFAZP9hJmxkyUzQyKDKIVZoLV AKUP8dWQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPe-00000002ZME-3lJP; Sat, 30 Mar 2024 02:25:42 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 18/18] mirrors: add blktrace mirror and use it Date: Fri, 29 Mar 2024 19:25:40 -0700 Message-ID: <20240330022540.612487-19-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 Now that adding mirrors is rather easier than before add the mirror for blktrace. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.defaults | 4 ++++ playbooks/roles/linux-mirror/defaults/main.yml | 1 + playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 | 3 +++ workflows/blktests/Kconfig | 9 ++++++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/kconfigs/Kconfig.defaults b/kconfigs/Kconfig.defaults index d552735bdb3b..b52ec86127d0 100644 --- a/kconfigs/Kconfig.defaults +++ b/kconfigs/Kconfig.defaults @@ -1,5 +1,9 @@ # Please keep in alphabetical order +config DEFAULT_BLKTRACE_URL + string + default "https://git.kernel.dk/blktrace" + config DEFAULT_DBENCH_URL string default "https://github.com/linux-kdevops/dbench.git" diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml index e0788bb43c94..7c0d7bf623f2 100644 --- a/playbooks/roles/linux-mirror/defaults/main.yml +++ b/playbooks/roles/linux-mirror/defaults/main.yml @@ -5,3 +5,4 @@ install_linux_mirror: False defaults_xfsprogs_git: "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git" defaults_xfsdump_git: "https://github.com/linux-kdevops/xfsdump-dev.git" defaults_dbench_git: "https://github.com/linux-kdevops/dbench.git" +defaults_blktrace_git: "https://git.kernel.dk/blktrace" diff --git a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 index 0389f3d76396..c85700738a14 100644 --- a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 +++ b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 @@ -8,3 +8,6 @@ mirrors: - short_name: "dbench" url: "{{ defaults_dbench_git }}" target: "dbench.git" + - short_name: "blktrace" + url: "{{ defaults_blktrace_git }}" + target: "blktrace.git" diff --git a/workflows/blktests/Kconfig b/workflows/blktests/Kconfig index 05e16bcf79cd..998939d137f9 100644 --- a/workflows/blktests/Kconfig +++ b/workflows/blktests/Kconfig @@ -159,9 +159,16 @@ config BLKTESTS_DATA Note that {{data_path}} corresponds to the location set by the configuration option CONFIG_WORKFLOW_DATA_PATH. +config HAVE_MIRROR_BLKTRACE + bool + depends on USE_LIBVIRT_MIRROR + default $(shell, scripts/check_mirror_present.sh /mirror/blktrace.git) + config BLKTRACE_GIT string "The blktrace git tree to clone" - default "https://git.kernel.dk/blktrace" + default DEFAULT_BLKTRACE_URL if !HAVE_MIRROR_BLKTRACE + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && GUESTFS help The blktrace git tree to clone. -- 2.43.0