From 41e3b4ec21604dd66dff79fe08ebc71906e315b6 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Mon, 11 Sep 2023 13:47:01 -0400 Subject: [PATCH 1/2] Fix the name of the workloads container image --- lib/clusterbuster/workloads/fio.workload | 2 +- lib/clusterbuster/workloads/sysbench.workload | 2 +- lib/clusterbuster/workloads/uperf.workload | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/clusterbuster/workloads/fio.workload b/lib/clusterbuster/workloads/fio.workload index b441968d..9be49f58 100644 --- a/lib/clusterbuster/workloads/fio.workload +++ b/lib/clusterbuster/workloads/fio.workload @@ -61,7 +61,7 @@ function fio_create_deployment() { local replicas=${4:-1} local containers_per_pod=${5:-1} local -i instance - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" create_sync_service "$namespace" "$((containers_per_pod * processes_per_pod * replicas * count))" \ "$((containers_per_pod * replicas * count))" for instance in $(seq "$first_deployment" $((count + first_deployment - 1))) ; do diff --git a/lib/clusterbuster/workloads/sysbench.workload b/lib/clusterbuster/workloads/sysbench.workload index 9662ecaf..fcf582b0 100644 --- a/lib/clusterbuster/workloads/sysbench.workload +++ b/lib/clusterbuster/workloads/sysbench.workload @@ -43,7 +43,7 @@ function sysbench_create_deployment() { local replicas=${4:-1} local containers_per_pod=${5:-1} local -i instance - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" create_sync_service "$namespace" \ "$((containers_per_pod * processes_per_pod * replicas * count))" \ "$((containers_per_pod * replicas * count))" diff --git a/lib/clusterbuster/workloads/uperf.workload b/lib/clusterbuster/workloads/uperf.workload index 03a2a0e9..1c948380 100644 --- a/lib/clusterbuster/workloads/uperf.workload +++ b/lib/clusterbuster/workloads/uperf.workload @@ -97,7 +97,7 @@ function uperf_create_deployment() { if ((((replicas * containers_per_pod * processes_per_pod) + 4) > ___uperf_port_addrs)) ; then ___uperf_port_addrs=$(((replicas * containers_per_pod * processes_per_pod) + 4)) fi - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" create_sync_service "$namespace" "$((containers_per_pod * replicas * count))" "$(( (containers_per_pod * replicas * count) + count))" for instance in $(seq "$first_deployment" $((count + first_deployment - 1))) ; do From fcd7f7962d046d2587f73f8838ff835441120e60 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Mon, 11 Sep 2023 14:02:54 -0400 Subject: [PATCH 2/2] Fix the tag so that all uses will get any update --- clusterbuster | 3 ++- lib/clusterbuster/workloads/fio.workload | 2 +- lib/clusterbuster/workloads/sysbench.workload | 2 +- lib/clusterbuster/workloads/uperf.workload | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/clusterbuster b/clusterbuster index 506118d5..b915e3be 100755 --- a/clusterbuster +++ b/clusterbuster @@ -207,6 +207,7 @@ declare pod_prefix= declare arch= declare failure_status=Fail declare -i create_pods_privileged=0 +declare perf_ci_tag=perf-ci-v1.2 declare -r sync_flag_file="/tmp/syncfile"; declare -r sync_error_file="/tmp/syncerror"; @@ -3420,7 +3421,7 @@ fi iworkload=$requested_workload requested_workload=$(get_workload "$requested_workload") || help_extended "(Unknown workload '$iworkload')" arch=${arch:-$(uname -m)} -container_image=${container_image:-quay.io/rkrawitz/clusterbuster:${arch}-perf-ci-v1.2} +container_image=${container_image:-quay.io/rkrawitz/clusterbuster:${arch}-${perf_ci_tag}} call_api -w "$requested_workload" -s "process_options" "${unknown_opts[@]}" || help "${unknown_opt_names[@]}" diff --git a/lib/clusterbuster/workloads/fio.workload b/lib/clusterbuster/workloads/fio.workload index 9be49f58..23cd6048 100644 --- a/lib/clusterbuster/workloads/fio.workload +++ b/lib/clusterbuster/workloads/fio.workload @@ -61,7 +61,7 @@ function fio_create_deployment() { local replicas=${4:-1} local containers_per_pod=${5:-1} local -i instance - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-${perf_ci_tag}" create_sync_service "$namespace" "$((containers_per_pod * processes_per_pod * replicas * count))" \ "$((containers_per_pod * replicas * count))" for instance in $(seq "$first_deployment" $((count + first_deployment - 1))) ; do diff --git a/lib/clusterbuster/workloads/sysbench.workload b/lib/clusterbuster/workloads/sysbench.workload index fcf582b0..31db6783 100644 --- a/lib/clusterbuster/workloads/sysbench.workload +++ b/lib/clusterbuster/workloads/sysbench.workload @@ -43,7 +43,7 @@ function sysbench_create_deployment() { local replicas=${4:-1} local containers_per_pod=${5:-1} local -i instance - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-${perf_ci_tag}" create_sync_service "$namespace" \ "$((containers_per_pod * processes_per_pod * replicas * count))" \ "$((containers_per_pod * replicas * count))" diff --git a/lib/clusterbuster/workloads/uperf.workload b/lib/clusterbuster/workloads/uperf.workload index 1c948380..7616d05c 100644 --- a/lib/clusterbuster/workloads/uperf.workload +++ b/lib/clusterbuster/workloads/uperf.workload @@ -97,7 +97,7 @@ function uperf_create_deployment() { if ((((replicas * containers_per_pod * processes_per_pod) + 4) > ___uperf_port_addrs)) ; then ___uperf_port_addrs=$(((replicas * containers_per_pod * processes_per_pod) + 4)) fi - container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-perf-ci-v1.2" + container_image="quay.io/rkrawitz/clusterbuster-workloads:${arch}-${perf_ci_tag}" create_sync_service "$namespace" "$((containers_per_pod * replicas * count))" "$(( (containers_per_pod * replicas * count) + count))" for instance in $(seq "$first_deployment" $((count + first_deployment - 1))) ; do