diff --git a/workloads/router-perf-v2/ingress-performance.sh b/workloads/router-perf-v2/ingress-performance.sh index eb000695..ee8d54f4 100755 --- a/workloads/router-perf-v2/ingress-performance.sh +++ b/workloads/router-perf-v2/ingress-performance.sh @@ -14,10 +14,18 @@ log "Deployment replicas: ${DEPLOYMENT_REPLICAS}" log "###############################################" check_hypershift deploy_infra -tune_workload_node apply + +if [[ ! ${HYPERSHIFT} == false ]]; then + tune_workload_node apply + reschedule_monitoring_stack worker +fi + client_pod=$(oc get pod -l app=http-scale-client -n http-scale-client | awk '/Running/{print $1}') -reschedule_monitoring_stack worker -configure_ingress_images + +if [[ ! -z "${INGRESS_OPERATOR_IMAGE}" ]] || [[ ! -z "${HAPROXY_IMAGE}" ]]; then + configure_ingress_images +fi + tune_liveness_probe if [[ ${METADATA_COLLECTION} == "true" ]]; then collect_metadata @@ -40,16 +48,22 @@ for termination in ${TERMINATIONS}; do fi done -enable_ingress_operator +if [[ ! -z "${INGRESS_OPERATOR_IMAGE}" ]]; then + enable_ingress_operator +fi + log "Copying mb test results locally (large file)" until oc rsync -n http-scale-client ${client_pod}:/tmp/results.csv ./; do echo "Transfer disrupted, retrying in 10 seconds..." sleep 10 done -tune_workload_node delete +if [[ ${HYPERSHIFT} == false ]]; then + tune_workload_node delete + reschedule_monitoring_stack infra +fi + cleanup_infra -reschedule_monitoring_stack infra export WORKLOAD="router-perf" run_benchmark_comparison