Skip to content

Enable minimum RPM version support #2234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 22, 2021
Merged

Enable minimum RPM version support #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f715319
Remove unused check_enable_copr from base
portante Apr 9, 2021
1431cf3
Enable minimum RPM version support
portante Apr 9, 2021
5479f39
Applying more code review feedback
portante Apr 21, 2021
e396988
Restore the use of 4 spaces to `require-rpm`
portante Apr 22, 2021
8114ca9
Use single quotes to avoid backslashes
portante Apr 22, 2021
29f90a9
Properly mock `rpm` instead of `require-rpm`
portante Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions agent/base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,36 +155,12 @@ function get_redhat_version() {
cat /etc/redhat-release | awk '{ print $7 }'
}

function check_enable_copr {
local copr_user=$1
local copr_name=$2

if is_fedora ; then
dnf copr enable ${copr_user}/${copr_name}
else
if is_redhat ; then
rhel_version=$(get_redhat_version)
rhel_major=${rhel_version%.*}
cd /etc/yum.repos.d/
local copr_url=https://copr.fedorainfracloud.org
local repo_file=${copr_user}-${copr_name}-epel-${rhel_major}.repo
[[ ! -f ${repo_file} ]] && wget -c ${copr_url}/coprs/${copr_user}/${copr_name}/repo/epel-${rhel_major}/${repo_file}
else
echo "Unsupported distribution"
fi
fi
}

function check_install_rpm {
_n="${1}"
_v="${2}"
require-rpm "${_n}" "${_v}"
_m="${3}"
_rpm=$(require-rpm "${_n}" "${_v}" "${_m}")
local rc=${?}
if [[ ! -z "${_v}" ]]; then
_rpm="${_n}-${_v}"
else
_rpm="${_n}"
fi
if [[ ${rc} -ne 0 ]]; then
error_log "[check_install_rpm] ${_rpm} is not installed"
else
Expand Down
7 changes: 4 additions & 3 deletions agent/bench-scripts/pbench-dbench
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if [[ -z "${ver}" ]]; then
error_log "${script_name}: package version is missing in config file"
exit 1
fi
match="$(pbench-config match ${benchmark})"

# Every bench-script follows a similar sequence:
# 1) process bench script arguments
Expand Down Expand Up @@ -65,10 +66,10 @@ client_nodes=""
sysinfo="default"

function install_dbench {
if check_install_rpm $benchmark_rpm $ver; then
debug_log "[$script_name]$benchmark_rpm is installed"
if check_install_rpm "${benchmark_rpm}" "${ver}" "${match}"; then
debug_log "[${script_name}]${benchmark_rpm}-${ver} is installed"
else
error_log "[$script_name]$benchmark_rpm installation failed, exiting"
error_log "[${script_name}]${benchmark_rpm}-${ver} is not installed, exiting"
exit 1
fi
}
Expand Down
5 changes: 3 additions & 2 deletions agent/bench-scripts/pbench-fio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if [[ -z "${ver}" ]]; then
error_log "${script_name}: package version is missing in config file"
exit 1
fi
match="$(pbench-config match ${benchmark})"
fio_server_port="$(pbench-config server_port ${benchmark})"
if [[ -z "${fio_server_port}" ]]; then
error_log "${script_name}: server_port is missing in config file"
Expand Down Expand Up @@ -174,11 +175,11 @@ function usage {
}

function fio_local_check_install() {
if check_install_rpm ${benchmark_rpm} ${ver}; then
if check_install_rpm "${benchmark_rpm}" "${ver}" "${match}"; then
debug_log "[${script_name}] ${benchmark_rpm}-${ver} is installed"
_rc=0
else
debug_log "[${script_name}] ${benchmark_rpm}-${ver} is not installed, exiting"
error_log "[${script_name}] ${benchmark_rpm}-${ver} is not installed, exiting"
_rc=1
fi
return ${_rc}
Expand Down
7 changes: 4 additions & 3 deletions agent/bench-scripts/pbench-iozone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ if [[ -z "${ver}" ]]; then
error_log "${script_name}: package version is missing in config file"
exit 1
fi
match="$(pbench-config match ${benchmark})"

# Every bench-script follows a similar sequence:
# 1) process bench script arguments
Expand Down Expand Up @@ -176,10 +177,10 @@ verify_common_bench_script_options $tool_group $sysinfo

## Ensure the right version of the benchmark is installed

if check_install_rpm $benchmark_rpm $ver; then
debug_log "[$script_name]$benchmark_rpm is installed"
if check_install_rpm "${benchmark_rpm}" "${ver}" "${match}"; then
debug_log "[${script_name}]${benchmark_rpm}-${ver} is installed"
else
debug_log "[$script_name]$benchmark_rpm installation failed, exiting"
error_log "[${script_name}]${benchmark_rpm}-${ver} is not installed, exiting"
exit 1
fi

Expand Down
7 changes: 4 additions & 3 deletions agent/bench-scripts/pbench-netperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ if [[ -z "${ver}" ]]; then
error_log "${script_name}: package version is missing in config file"
exit 1
fi
match="$(pbench-config match ${benchmark})"

# Formatting spacing for output report.
spacing=25
Expand Down Expand Up @@ -129,10 +130,10 @@ function start_server {
}

function install_netperf {
if check_install_rpm $benchmark_rpm $ver; then
debug_log "[$script_name]$benchmark_rpm is installed"
if check_install_rpm "${benchmark_rpm}" "${ver}" "${match}"; then
debug_log "[${script_name}]${benchmark_rpm}-${ver} is installed"
else
error_log "[$script_name]$benchmark_rpm installation failed, exiting"
error_log "[${script_name}]${benchmark_rpm}-${ver} is not installed, exiting"
exit 1
fi
}
Expand Down
7 changes: 4 additions & 3 deletions agent/bench-scripts/pbench-uperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ if [[ -z "${ver}" ]]; then
error_log "${script_name}: package version is missing in config file"
exit 1
fi
match="$(pbench-config match ${benchmark})"

# Every bench-script follows a similar sequence:
# 1) process bench script arguments
Expand Down Expand Up @@ -191,10 +192,10 @@ function stop_server {
}

function install_uperf {
if check_install_rpm ${benchmark_rpm} ${ver}; then
debug_log "[$script_name] ${benchmark_rpm}-${ver} is installed"
if check_install_rpm "${benchmark_rpm}" "${ver}" "${match}"; then
debug_log "[${script_name}] ${benchmark_rpm}-${ver} is installed"
else
error_log "[$script_name] ${benchmark_rpm}-${ver} is not installed, exiting"
error_log "[${script_name}] ${benchmark_rpm}-${ver} is not installed, exiting"
exit 1
fi
}
Expand Down
1 change: 0 additions & 1 deletion agent/bench-scripts/test-bin/rpm
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions agent/bench-scripts/test-bin/rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

args="${@}"
echo "${0} ${args}" >> ${_testlog}

if [[ "${1}" != "--query" ]]; then
printf -- "rpm: unexpected 1st argument, '%s'\n" "${1}" >&2
exit 101
fi
if [[ "${2}" != "--queryformat=%{EVR}" ]]; then
printf -- "rpm: unexpected 2nd argument, '%s'\n" "${2}" >&2
exit 101
fi

# Mimic behavior of rpm by exiting with 0 (for unit tests we always find
# the RPM) and emitting the RPM version that was found (whatever was given
# as arguments, if not one of the specific RPMs to mimic).
if [[ "${3}" == "fio" ]]; then
echo "fio-3.21"
elif [[ "${3}" == "uperf" ]]; then
echo "uperf-1.0.7"
else
echo "${3}"
fi
exit 0
3 changes: 3 additions & 0 deletions agent/bench-scripts/tests/pbench-fio/test-03.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
[debug][1900-01-01T00:00:00.000000] [check_install_rpm] fio-3.21 is installed
[debug][1900-01-01T00:00:00.000000] [pbench-fio] fio-3.21 is installed
--- pbench.log file contents
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
--- test-execution.log file contents
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-04.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-04_1900.01.01T00.00.00/6-randrw-1024KiB/sample5
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
--- test-execution.log file contents
+++ fio_test-04_1900.01.01T00.00.00/metadata.log file contents
[pbench]
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-05.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-05_1900.01.01T00.00.00/3-rw-1024KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-06.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-06_1900.01.01T00.00.00/3-rw-1024KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no bar firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-07.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-07_1900.01.01T00.00.00/1-read-4KiB/sample5
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-08.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-08_1900.01.01T00.00.00/1-read-4KiB/sample5
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-13.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-13_1900.01.01T00.00.00/2-read-4KiB-rbd1/sample5
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.121.112 firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-15.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-15_1900.01.01T00.00.00/6-randread-42KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
--- test-execution.log file contents
+++ fio_test-15_1900.01.01T00.00.00/metadata.log file contents
[pbench]
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-16.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-16_1900.01.01T00.00.00/1-rw-42KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.1.1 /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.1.1 firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no 192.168.1.1 if [ -L /dev/sda0 ]; then dev=/dev/; fi; test -b /dev/sda0
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-20.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-20_1900.01.01T00.00.00/3-read-1024KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no abc /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no abc firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no abc firewall-cmd --add-port=8765/tcp >/dev/null
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-28.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-28_1900.01.01T00.00.00/1-read-8KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
--- test-execution.log file contents
+++ fio_test-28_1900.01.01T00.00.00/metadata.log file contents
[pbench]
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-30.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-30_1900.01.01T00.00.00/1-read-4KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA killall fio >/dev/null 2>&1
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-31.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-31_1900.01.01T00.00.00/1-read-4KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no nodeA killall fio >/dev/null 2>&1
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-fio/test-32.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ fio job complete
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/fio_test-32_1900.01.01T00.00.00/1-rw-42KiB/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=default default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} fio
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no hist.bar /var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/pbench-fio --install
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no hist.bar firewall-cmd --add-port=8765/tcp >/dev/null
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no hist.bar killall fio >/dev/null 2>&1
Expand Down
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-trafficgen/test-39.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,5 @@ Iteration 3-5000000-revunidirectional-74B-1000flows-0.0pct_drop complete (3 of 3
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-stop-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/3-default/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=none default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=none default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} dpdk-tools
--- test-execution.log file contents
1 change: 1 addition & 0 deletions agent/bench-scripts/tests/pbench-trafficgen/test-40.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,5 @@ Iteration 3-5000000-revunidirectional-74B-1000flows-0.0pct_drop complete (3 of 3
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-postprocess-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/3-5000000-revunidirectional-74B-1000flows-0.0pct_drop/sample1
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-start --sysinfo=none default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-tool-meister-stop --sysinfo=none default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR} dpdk-tools
--- test-execution.log file contents
Loading