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 87E837E2 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=1711765546; cv=none; b=bc/jk++pCk+wnrjStSX6DAlFNkP9iEauJTHNQEbNpZt/kfjf8IzR74vQa2MSJNvvJSo+ag5DBIMlAkLag4AtgzMd7IUmYUj4jP+Gpyow3Lgw1N3eJ3YNzB6VydC9OVbyTK9a7KtEk1R+rmSo0rqrIEoAbuFibh5S09IQgGTy4pI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711765546; c=relaxed/simple; bh=jHBhaGYTs+MBmYTGFVhQrLZ0Wb6BMFD0djg/EP+Y9+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MxlZ9ju0KD9ljRh6fg5ZhtFGuORZTazXb3LikXLW7JdI2rgU0S6vhMpTSBTYpvPLTm5iMPxTqdQG1xEfkAecgyIE23cTn6vqwAdqA8jitCJaydC8fn5NvqXbv2JbHkvn3VAiAT8YoqD370S55LgpUovKwm5Cg0xiD7zRJP7irFM= 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=GL0bAxDM; 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="GL0bAxDM" 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=G1acho0GyJ8NvwjEQDE+qM0hJnnxp93HBB5lmF7wTOM=; b=GL0bAxDMO9acf1M0i2uSVPxeV0 k/shKfWToW/RLen/rk1IGtUxXftMJuup2ovUkZoaEqvzs7BRkrS7+N0aug2hb1VGdgzXM9lVSvIFx 4VquBmfcexMjYUKwYrRlcET7R/1gpbIdnvtbZ4l4Kwfu3AfHQ6VLeC79BGFXGeIY5D+h0uuFKa8Ni ooly1BCHrFEyAsfu3qJeVftQL9rMm+Z6LSIvAR/k2xxp1GCvxaoU3/8L56vB3v1Teeyuaqva4JgY+ 2GfR71gq8CQwcZssw/d1zQdJL4+dPc+eMIteP8J3xNVJTxi7saUysOY26PIBZTyd4qkyl0t3Q6DL3 TpkhwBcA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rqOPe-00000002ZM8-3TDI; Sat, 30 Mar 2024 02:25:42 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 17/18] mirrors: add dbench git Date: Fri, 29 Mar 2024 19:25:39 -0700 Message-ID: <20240330022540.612487-18-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 We're actually the main source of the latest dbench so just use that. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.defaults | 4 ++++ playbooks/roles/blktests/defaults/main.yml | 1 + playbooks/roles/blktests/tasks/main.yml | 2 +- playbooks/roles/linux-mirror/defaults/main.yml | 1 + .../roles/linux-mirror/templates/mirrors.yaml.j2 | 3 +++ workflows/blktests/Kconfig | 11 +++++++++++ workflows/blktests/Makefile | 1 + 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kconfigs/Kconfig.defaults b/kconfigs/Kconfig.defaults index e559f28f964d..d552735bdb3b 100644 --- a/kconfigs/Kconfig.defaults +++ b/kconfigs/Kconfig.defaults @@ -1,5 +1,9 @@ # Please keep in alphabetical order +config DEFAULT_DBENCH_URL + string + default "https://github.com/linux-kdevops/dbench.git" + config DEFAULT_XFSDUMP_URL string default "https://github.com/linux-kdevops/xfsdump-dev.git" diff --git a/playbooks/roles/blktests/defaults/main.yml b/playbooks/roles/blktests/defaults/main.yml index dd009f58b3a3..8c50bf6d8e63 100644 --- a/playbooks/roles/blktests/defaults/main.yml +++ b/playbooks/roles/blktests/defaults/main.yml @@ -22,3 +22,4 @@ nbd_version: "nbd-3.21" nbd_data: "{{data_path}}/nbd" compile_dbench: False +blktests_dbench_git: "https://github.com/linux-kdevops/dbench.git" diff --git a/playbooks/roles/blktests/tasks/main.yml b/playbooks/roles/blktests/tasks/main.yml index fd4943b36088..590f981af0b8 100644 --- a/playbooks/roles/blktests/tasks/main.yml +++ b/playbooks/roles/blktests/tasks/main.yml @@ -42,7 +42,7 @@ name: compile_dbench vars: dbench_data: "{{ data_path }}/dbench" - dbench_git: "https://github.com/linux-kdevops/dbench.git" + dbench_git: "{{ blktests_dbench_git }}" tags: [ 'oscheck', 'git', 'dbench'] - name: Remove any old blktrace as we always clone a fresh tree diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml index 461f47cfedf9..e0788bb43c94 100644 --- a/playbooks/roles/linux-mirror/defaults/main.yml +++ b/playbooks/roles/linux-mirror/defaults/main.yml @@ -4,3 +4,4 @@ mirror_user_system_dir: "~/.config/systemd/user/" 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" diff --git a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 index 2f0267c27c7b..0389f3d76396 100644 --- a/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 +++ b/playbooks/roles/linux-mirror/templates/mirrors.yaml.j2 @@ -5,3 +5,6 @@ mirrors: - short_name: "xfsdump" url: "{{ defaults_xfsdump_git }}" target: "xfsdump-dev.git" + - short_name: "dbench" + url: "{{ defaults_dbench_git }}" + target: "dbench.git" diff --git a/workflows/blktests/Kconfig b/workflows/blktests/Kconfig index 2be13de90a76..05e16bcf79cd 100644 --- a/workflows/blktests/Kconfig +++ b/workflows/blktests/Kconfig @@ -12,6 +12,17 @@ config HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG_RESET bool default n +config HAVE_MIRROR_DBENCH + bool + depends on USE_LIBVIRT_MIRROR + default $(shell, scripts/check_mirror_present.sh /mirror/dbench.git) + +config BLKTESTS_DBENCH_GIT_URL + string + default DEFAULT_DBENCH_URL if !HAVE_MIRROR_DBENCH + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && VAGRANT + default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && GUESTFS + config BLKTESTS_WATCHDOG bool "Enable kdevops blktests watchdog" default y if HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG diff --git a/workflows/blktests/Makefile b/workflows/blktests/Makefile index 829694af8bd3..ac4e8c2d1831 100644 --- a/workflows/blktests/Makefile +++ b/workflows/blktests/Makefile @@ -27,6 +27,7 @@ NBD_DATA:=$(subst ",,$(CONFIG_NBD_DATA)) BLKTESTS_DATA_TARGET:=$(subst ",,$(CONFIG_BLKTESTS_DATA_TARGET)) +BLKTESTS_ARGS += blktests_dbench_git='$(subst ",,$(CONFIG_BLKTESTS_DBENCH_GIT_URL))' BLKTESTS_ARGS += blktests_git='$(BLKTESTS_GIT)' BLKTESTS_ARGS += blktests_data=\"$(BLKTESTS_DATA)\" -- 2.43.0