From c62456ee181efde94776da22ba62c43ce6d964ef Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Mon, 9 Oct 2023 19:00:34 +0300 Subject: [PATCH 1/2] include 'fio' for filesystem performance benchmarking --- Makefile | 6 ++++++ packages/host/fio/Manifest | 2 ++ scripts/common/common.sh | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 packages/host/fio/Manifest diff --git a/Makefile b/Makefile index 2d737c257a..819b7954ed 100644 --- a/Makefile +++ b/Makefile @@ -205,6 +205,12 @@ dist/host-openssl.tar.gz: mkdir -p dist tar cf - -C build packages/host/openssl | gzip > dist/host-openssl.tar.gz +dist/host-fio.tar.gz: + mkdir -p build/packages/host/fio + bin/save-manifest-assets.sh "host-fio" packages/host/fio/Manifest $(CURDIR)/build/packages/host/fio + mkdir -p dist + tar cf - -C build packages/host/fio | gzip > dist/host-fio.tar.gz + dist/host-longhorn.tar.gz: mkdir -p build/packages/host/longhorn bin/save-manifest-assets.sh "host-longhorn" packages/host/longhorn/Manifest $(CURDIR)/build/packages/host/longhorn diff --git a/packages/host/fio/Manifest b/packages/host/fio/Manifest new file mode 100644 index 0000000000..b08eefea69 --- /dev/null +++ b/packages/host/fio/Manifest @@ -0,0 +1,2 @@ +yum fio +apt fio diff --git a/scripts/common/common.sh b/scripts/common/common.sh index 6d17b8076a..4ab199c5fd 100644 --- a/scripts/common/common.sh +++ b/scripts/common/common.sh @@ -720,6 +720,7 @@ function path_add() { function install_host_dependencies() { install_host_dependencies_openssl + install_host_dependencies_fio } function install_host_dependencies_openssl() { @@ -740,6 +741,24 @@ function install_host_dependencies_openssl() { install_host_archives "${DIR}/packages/host/openssl" openssl } +function install_host_dependencies_fio() { + if commandExists "fio"; then + return + fi + + if is_rhel_9_variant ; then + yum_ensure_host_package fio + return + fi + + if [ "$AIRGAP" != "1" ] && [ -n "$DIST_URL" ]; then + local package="host-fio.tar.gz" + package_download "${package}" + tar xf "$(package_filepath "${package}")" --no-same-owner + fi + install_host_archives "${DIR}/packages/host/fio" fio +} + function maybe_read_kurl_config_from_cluster() { # if KURL_INSTALL_DIRECTORY_FLAG is set, use the value from the flag if [ -z "$KURL_INSTALL_DIRECTORY_FLAG" ]; then From a0dad6a38ef165f9ae3e1fd69ff9f1c4eb9bd70f Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Mon, 9 Oct 2023 19:05:12 +0300 Subject: [PATCH 2/2] yum8 and yumol --- packages/host/fio/Manifest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/host/fio/Manifest b/packages/host/fio/Manifest index b08eefea69..d7b442b8b5 100644 --- a/packages/host/fio/Manifest +++ b/packages/host/fio/Manifest @@ -1,2 +1,4 @@ yum fio +yum8 fio +yumol fio apt fio