Merge branch 'main' into claude_test_tools_wrappers

Author: dvalinrh

README

@@ -20,14 +20,9 @@ They all have a --usage option
 
 convert_csv_to_txt: Converts a csv file to a plain text file
 create_filesystem: creates the designated filesystem type on the designated devices
-execute_via_pbench: Runs a program via the pbench wrappers
 general_setup: Wrappers source this file to process the common options.
 grab_disks: List the disks on the system that are not in use.
 lvm_create: Creates an lvm
 lvm_delete: Deletes an lvm
-pbench_copy_data: Takes the results from a pbench user run and saves the data.  By default we move the data.
-pull_data:  Process the csv data for the tests.
-set_pbench_variables
-umount_filesystems: unmounts a series of filesystems.
 detect_os: Determines the currently running OS
 detect_numa: Allows fetching NUMA information on a system

execute_via_pbench

@@ -10,6 +10,8 @@ usage()
 	echo "  --usage: This usage message."
 	echo "  --pip_packages: comma separated list of pip modules to install"
 	echo "  --python_exec: path to python interpreter to install pip modules for (default \"python3\"), will require installation of relevant packages to install pip"
+	echo "  --update_cache: Update package cache before install/updating packages, 1 (default) updates cache, 0 skips cache update"
+	echo "  --python_exec: path to python intrepreter to install pip modules for (default \"python3\"), will require installation of relevant packages to install pip"
 	exit 1
 }
 
@@ -27,10 +29,19 @@ remove_packages=""
 wrapper_config=""
 pip_packages=""
 python_exec="python3"
+update_cache=1
+cache_cmd=""
 
 base_dir=$(dirname $(realpath $0))
 running_os=$($base_dir/detect_os)
 
+update_system_cache() {
+	if [[ "$update_cache" -eq 1 ]]; then
+		$install_cmd $cache_cmd
+	fi
+	update_cache=0 # Prevent multiple cache updates
+}
+
 # Install System packages
 # Args:
 # - Comma separated list of packages, can also be space separated and work
@@ -41,7 +52,7 @@ install_system_pkgs() {
 	if [[ -z "$package_list" ]]; then
 		return 0 # Nothing to do
 	fi
-
+	update_system_cache
 	for package in $package_list; do
 		$install_cmd install -y $package
 		if [ $? -ne 0 ]; then
@@ -116,6 +127,7 @@ install_pip_pkgs() {
 ARGUMENT_LIST=(
 	"is_installed"
 	"no_packages"
+	"update_cache"
 	"packages"
 	"remove_packages"
 	"wrapper_config"
@@ -179,6 +191,10 @@ while [[ $# -gt 0 ]]; do
 			wrapper_config=$2
 			shift 2
 		;;
+		--update_cache)
+			update_cache=$2
+			shift 2
+		;;
 		-h)
 			usage $0
 		;;
@@ -196,16 +212,19 @@ install_cmd=""
 case "$running_os" in
 	"ubuntu")
 		install_cmd="/bin/apt"
+		cache_cmd="update"
 	;;
 	"sles")
 		install_cmd="/usr/bin/zypper"
+		cache_cmd="refresh"
 	;;
 	*)
 		if [[ -f "/bin/dnf" ]]; then
 			install_cmd="/bin/dnf"
 		elif [[ -f "/bin/yum" ]]; then
 			install_cmd="/bin/yum"
 		fi
+		cache_cmd="makecache"
 	;;
 esac