Skip to content

Commit

Permalink
python3.8 for ripsaw-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
mukrishn committed Oct 26, 2021
1 parent f6d0276 commit 3aed0e9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
6 changes: 5 additions & 1 deletion utils/benchmark-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ install_cli() {
ripsaw_tmp=/tmp/ripsaw-cli
mkdir -p ${ripsaw_tmp}
if [[ ! -f ${ripsaw_tmp}/bin/activate ]]; then
python -m venv ${ripsaw_tmp}
if [[ "${isBareMetal}" == "true" ]]; then
python3.8 -m venv ${ripsaw_tmp}
else
python -m venv ${ripsaw_tmp}
fi
fi
source ${ripsaw_tmp}/bin/activate
pip3 install -U "git+https://github.com/cloud-bulldozer/benchmark-operator.git/#egg=ripsaw-cli&subdirectory=cli"
Expand Down
19 changes: 11 additions & 8 deletions workloads/network-perf/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export_defaults() {

#If using baremetal we use different query to find worker nodes
if [[ "${isBareMetal}" == "true" ]]; then
#Installing python3.8
sudo yum -y install python3.8

nodeCount=$(oc get nodes --no-headers -l node-role.kubernetes.io/worker | wc -l)
if [[ ${nodeCount} -ge 2 ]]; then
serverNumber=$(( $RANDOM %${nodeCount} + 1 ))
Expand Down Expand Up @@ -89,20 +92,20 @@ export_defaults() {

if [ ${WORKLOAD} == "hostnet" ]
then
export hostnetwork=true
export serviceip=false
export HOSTNETWORK=true
export SERVICEIP=false
elif [ ${WORKLOAD} == "service" ]
then
export hostnetwork=false
export serviceip=true
export HOSTNETWORK=false
export SERVICEIP=true
if [[ "${isBareMetal}" == "true" ]]; then
export _metadata_targeted=true
export METADATA_TARGETED=true
else
export _metadata_targeted=false
export METADATA_TARGETED=false
fi
else
export hostnetwork=false
export serviceip=false
export HOSTNETWORK=false
export SERVICEIP=false
fi

if [[ -z "$GSHEET_KEY_LOCATION" ]]; then
Expand Down

0 comments on commit 3aed0e9

Please sign in to comment.