Skip to content
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

Jump to bottom

Skipping steps not needed for hypershift #529

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skipping steps not needed for hypershift #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 20 additions & 6 deletions workloads/router-perf-v2/ingress-performance.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ log "Deployment replicas: ${DEPLOYMENT_REPLICAS}"
log "###############################################"
check_hypershift
deploy_infra
tune_workload_node apply

if [[ ! ${HYPERSHIFT} == false ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can add this variable HYPERSHIFT to the docs?

Copy link
Member

@rsevilla87 rsevilla87 Feb 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [[ ! ${HYPERSHIFT} == false ]]; then
if [[ ${HYPERSHIFT} != "true" ]]; 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
Copy link
Member

@rsevilla87 rsevilla87 Feb 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [[ ! -z "${INGRESS_OPERATOR_IMAGE}" ]] || [[ ! -z "${HAPROXY_IMAGE}" ]]; then
if [[ -n ${INGRESS_OPERATOR_IMAGE} ]] || [[ -n ${HAPROXY_IMAGE} ]]; then

configure_ingress_images
fi

tune_liveness_probe
if [[ ${METADATA_COLLECTION} == "true" ]]; then
collect_metadata
Expand All @@ -40,16 +48,22 @@ for termination in ${TERMINATIONS}; do
fi
done

enable_ingress_operator
if [[ ! -z "${INGRESS_OPERATOR_IMAGE}" ]]; then
Copy link
Member

@rsevilla87 rsevilla87 Feb 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [[ ! -z "${INGRESS_OPERATOR_IMAGE}" ]]; then
if [[ -n ${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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if [[ ${HYPERSHIFT} == false ]]; then
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
Expand Down