From 5a136eef87b4bd0638fe871df4ff651aa4f965d4 Mon Sep 17 00:00:00 2001 From: Eli Battat Date: Thu, 26 Oct 2023 20:04:02 +0300 Subject: [PATCH] add windows11 bootstorm workload --- .github/workflows/Nightly_Perf_Env_CI.yml | 28 +- .../internal_data/windows_vm_template.yaml | 14 +- .../windows/windows_data_template.yaml | 4 +- .../grafana/perf/jsonnet/main.libsonnet | 575 ++++++------------ .../workloads/workloads_operations.py | 5 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- .../windows_dv.yaml | 2 +- .../windows_vm.yaml | 16 +- 21 files changed, 320 insertions(+), 450 deletions(-) diff --git a/.github/workflows/Nightly_Perf_Env_CI.yml b/.github/workflows/Nightly_Perf_Env_CI.yml index 272551351..6778dc08e 100644 --- a/.github/workflows/Nightly_Perf_Env_CI.yml +++ b/.github/workflows/Nightly_Perf_Env_CI.yml @@ -110,7 +110,11 @@ jobs: - 'vdbench_vm_scale' - 'clusterbuster' - 'bootstorm_vm_scale' - - 'windows_vm_scale' + - 'windows_vm_scale_windows10' + - 'windows_vm_scale_windows11' + - 'windows_vm_scale_windows_server_2019' + - 'windows_vm_scale_windows_server_2022' + steps: - uses: actions/checkout@v3 - name: Set up Python 3.10 @@ -181,30 +185,42 @@ jobs: THREADS_LIMIT: 20 RUN_TYPE: 'perf_ci' ENABLE_PROMETHEUS_SNAPSHOT: 'True' - WINDOWS_URL: ${{ secrets.PERF_WINDOWS_URL }} + WINDOWS10_URL: ${{ secrets.PERF_WINDOWS10_URL }} + WINDOWS11_URL: ${{ secrets.PERF_WINDOWS11_URL }} + WINDOWS_SERVER_2019_URL: ${{ secrets.PERF_WINDOWS_SERVER_2019_URL }} + WINDOWS_SERVER_2022_URL: ${{ secrets.PERF_WINDOWS_SERVER_2022_URL }} run: | build=$(pip freeze | grep benchmark-runner | sed 's/==/=/g') build_version="$(cut -d'=' -f2 <<<"$build")" echo '>>>>>>>>>>>>>>>>>>>>>>>>>> Start E2E workload: ${{ matrix.workload }} >>>>>>>>>>>>>>>>>>>>>>>>>>' scp -r "$RUNNER_PATH/.kube/config" provision:"$CONTAINER_KUBECONFIG_PATH" - # SCALE: Run vdbench/ bootstorm - if [[ '${{ matrix.workload }}' == 'vdbench_pod_scale' || '${{ matrix.workload }}' == 'vdbench_kata_scale' || '${{ matrix.workload }}' == 'vdbench_vm_scale' || '${{ matrix.workload }}' == 'bootstorm_vm_scale' || '${{ matrix.workload }}' == 'windows_vm_scale' ]] + workload=$(awk -F_ '{print $1"_"$2}' <<< '${{ matrix.workload }}') + run=$(awk -F_ '{print $3}' <<< '${{ matrix.workload }}') + # SCALE RUN + if [[ '$run' == 'scale' ]] then - workload=$(awk -F_ '{print $1"_"$2}' <<< '${{ matrix.workload }}') # bootstorm_vm_scale: no need redis for synchronization but need SCALE and THREADS_LIMIT if [[ '${{ matrix.workload }}' == 'bootstorm_vm_scale' ]] then # Warm-up: Pull the Fedora image from quay.io for each node ssh -t provision "podman run --rm -t -e WORKLOAD='$workload' -e KUBEADMIN_PASSWORD='$KUBEADMIN_PASSWORD' -e SCALE='$SCALE' -e SCALE_NODES=$SCALE_NODES -e REDIS='$REDIS' -e RUN_ARTIFACTS_URL='$RUN_ARTIFACTS_URL' -e BUILD_VERSION='$build_version' -e RUN_TYPE='$RUN_TYPE' -e KATA_CPUOFFLINE_WORKAROUND='True' -e SAVE_ARTIFACTS_LOCAL='False' -e ENABLE_PROMETHEUS_SNAPSHOT='$ENABLE_PROMETHEUS_SNAPSHOT' -e THREADS_LIMIT='$THREADS_LIMIT' -e WINDOWS_URL='$WINDOWS_URL' -e TIMEOUT='$TIMEOUT' -e log_level='INFO' -v '$CONTAINER_KUBECONFIG_PATH':'$CONTAINER_KUBECONFIG_PATH' --privileged 'quay.io/ebattat/benchmark-runner:latest'" SCALE=$BOOTSTORM_SCALE - elif [[ '${{ matrix.workload }}' == 'windows_vm_scale' ]] + elif [[ '$workload' == 'windows_vm' ]] then + case '${{ matrix.workload }}' in + 'windows_vm_scale_windows10') WINDOWS_URL=$WINDOWS10_URL ;; + 'windows_vm_scale_windows11') WINDOWS_URL=$WINDOWS11_URL ;; + 'windows_vm_scale_windows_server_2019') WINDOWS_URL=$WINDOWS_SERVER_2019_URL ;; + 'windows_vm_scale_windows_server_2022') WINDOWS_URL=$WINDOWS_SERVER_2022_URL ;; + *) echo "Unknown Windows scale workload ${{ matrix_workload }}"; exit 1 ;; + esac # Warm-up: Load DV for Windows ssh -t provision "podman run --rm -t -e WORKLOAD='$workload' -e KUBEADMIN_PASSWORD='$KUBEADMIN_PASSWORD' -e SCALE='$SCALE' -e SCALE_NODES=$SCALE_NODES -e REDIS='$REDIS' -e RUN_ARTIFACTS_URL='$RUN_ARTIFACTS_URL' -e BUILD_VERSION='$build_version' -e RUN_TYPE='$RUN_TYPE' -e KATA_CPUOFFLINE_WORKAROUND='True' -e SAVE_ARTIFACTS_LOCAL='False' -e ENABLE_PROMETHEUS_SNAPSHOT='$ENABLE_PROMETHEUS_SNAPSHOT' -e THREADS_LIMIT='$THREADS_LIMIT' -e WINDOWS_URL='$WINDOWS_URL' -e TIMEOUT='$TIMEOUT' -e log_level='INFO' -v '$CONTAINER_KUBECONFIG_PATH':'$CONTAINER_KUBECONFIG_PATH' --privileged 'quay.io/ebattat/benchmark-runner:latest'" SCALE=$WINDOWS_SCALE fi # SCALE_NODES is a list, not add '' ssh -t provision "podman run --rm -t -e WORKLOAD='$workload' -e KUBEADMIN_PASSWORD='$KUBEADMIN_PASSWORD' -e SCALE='$SCALE' -e SCALE_NODES=$SCALE_NODES -e REDIS='$REDIS' -e PIN_NODE_BENCHMARK_OPERATOR='$PIN_NODE_BENCHMARK_OPERATOR' -e PIN_NODE1='$PIN_NODE1' -e PIN_NODE2='$PIN_NODE2' -e ELASTICSEARCH='$ELASTICSEARCH' -e ELASTICSEARCH_PORT='$ELASTICSEARCH_PORT' -e ELASTICSEARCH_USER='$ELASTICSEARCH_USER' -e ELASTICSEARCH_PASSWORD='$ELASTICSEARCH_PASSWORD' -e IBM_REGION_NAME='$IBM_REGION_NAME' -e IBM_ENDPOINT_URL='$IBM_ENDPOINT_URL' -e IBM_ACCESS_KEY_ID='$IBM_ACCESS_KEY_ID' -e IBM_SECRET_ACCESS_KEY='$IBM_SECRET_ACCESS_KEY' -e IBM_BUCKET='$IBM_BUCKET' -e IBM_KEY='$IBM_KEY' -e RUN_ARTIFACTS_URL='$RUN_ARTIFACTS_URL' -e BUILD_VERSION='$build_version' -e RUN_TYPE='$RUN_TYPE' -e KATA_CPUOFFLINE_WORKAROUND='True' -e SAVE_ARTIFACTS_LOCAL='False' -e ENABLE_PROMETHEUS_SNAPSHOT='$ENABLE_PROMETHEUS_SNAPSHOT' -e THREADS_LIMIT='$THREADS_LIMIT' -e WINDOWS_URL='$WINDOWS_URL' -e TIMEOUT='$TIMEOUT' -e log_level='INFO' -v '$CONTAINER_KUBECONFIG_PATH':'$CONTAINER_KUBECONFIG_PATH' --privileged 'quay.io/ebattat/benchmark-runner:latest'" + # NOT SCALE RUN else if [[ '${{ matrix.workload }}' == 'clusterbuster' ]] then diff --git a/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml b/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml index 5990ab67c..2be8d6a1a 100644 --- a/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml +++ b/benchmark_runner/common/template_operations/templates/windows/internal_data/windows_vm_template.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: {% if scale -%} @@ -33,6 +33,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -63,11 +69,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -78,7 +85,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: diff --git a/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml b/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml index b8536c119..ce47fbe63 100644 --- a/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml +++ b/benchmark_runner/common/template_operations/templates/windows/windows_data_template.yaml @@ -13,11 +13,11 @@ template_data: limit_memory: 2G limit_cpu: 1 sockets: 1 - storage: 40Gi + storage: 70Gi default: requests_memory: 2G requests_cpu: 1 limit_memory: 2G limit_cpu: 1 sockets: 1 - storage: 40Gi + storage: 70Gi diff --git a/benchmark_runner/grafana/perf/jsonnet/main.libsonnet b/benchmark_runner/grafana/perf/jsonnet/main.libsonnet index 465a7b3df..557639a72 100644 --- a/benchmark_runner/grafana/perf/jsonnet/main.libsonnet +++ b/benchmark_runner/grafana/perf/jsonnet/main.libsonnet @@ -225,7 +225,7 @@ g.dashboard.new('PerfCI-Regression-Summary') + stateTimeline.fieldConfig.defaults.withMappings([ stateTimeline.valueMapping.RegexMap.withOptions( //START_VALUE_MAPPING_227 - {"0": {"index": 0, "text": "fail"}, "1": {"index": 1, "text": "pass"}, "102": {"index": 13, "text": "1.0.2"}, "110": {"index": 14, "text": "1.1.0"}, "120": {"index": 15, "text": "1.2.0"}, "121": {"index": 16, "text": "1.2.1"}, "130": {"index": 45, "text": "1.3.0"}, "131": {"index": 117, "text": "1.3.1"}, "132": {"index": 76, "text": "1.3.2"}, "133": {"index": 77, "text": "1.3.3"}, "140": {"index": 118, "text": "1.4.0"}, "483": {"index": 0, "text": "4.8.3"}, "484": {"index": 1, "text": "4.8.4"}, "485": {"index": 2, "text": "4.8.5"}, "486": {"index": 3, "text": "4.8.6"}, "487": {"index": 4, "text": "4.8.7"}, "488": {"index": 5, "text": "4.8.8"}, "3025": {"index": 86, "text": "3.0.2-5"}, "3026": {"index": 119, "text": "3.0.2-6"}, "4102": {"index": 33, "text": "4.10.2"}, "4104": {"index": 34, "text": "4.10.4"}, "4105": {"index": 35, "text": "4.10.5"}, "4106": {"index": 36, "text": "4.10.6"}, "4108": {"index": 37, "text": "4.10.8"}, "4109": {"index": 38, "text": "4.10.9"}, "4114": {"index": 54, "text": "4.11.4"}, "4115": {"index": 55, "text": "4.11.5"}, "4116": {"index": 56, "text": "4.11.6"}, "4117": {"index": 57, "text": "4.11.7"}, "4118": {"index": 58, "text": "4.11.8"}, "4119": {"index": 59, "text": "4.11.9"}, "4120": {"index": 68, "text": "4.12.0"}, "4121": {"index": 69, "text": "4.12.1"}, "4122": {"index": 70, "text": "4.12.2"}, "4124": {"index": 80, "text": "4.12.4"}, "4130": {"index": 106, "text": "4.13.0"}, "4131": {"index": 109, "text": "4.13.1"}, "4132": {"index": 110, "text": "4.13.2"}, "4133": {"index": 111, "text": "4.13.3"}, "4814": {"index": 6, "text": "4.8.14"}, "4932": {"index": 8, "text": "4.9.3-2"}, "4947": {"index": 9, "text": "4.9.4-7"}, "4955": {"index": 10, "text": "4.9.5-5"}, "4961": {"index": 11, "text": "4.9.6-1"}, "4972": {"index": 12, "text": "4.9.7-2"}, "41002": {"index": 30, "text": "4.10.0-rc.2"}, "41003": {"index": 31, "text": "4.10.0-rc.3"}, "41007": {"index": 32, "text": "4.10.0-rc.7"}, "41010": {"index": 39, "text": "4.10.10"}, "41011": {"index": 40, "text": "4.10.11"}, "41012": {"index": 41, "text": "4.10.12"}, "41013": {"index": 42, "text": "4.10.13"}, "41014": {"index": 43, "text": "4.10.14"}, "41015": {"index": 44, "text": "4.10.15"}, "41016": {"index": 21, "text": "4.10.1-6"}, "41021": {"index": 28, "text": "4.10.2-1"}, "41023": {"index": 29, "text": "4.10.2-3"}, "41054": {"index": 49, "text": "4.10.5-4"}, "41066": {"index": 48, "text": "4.10.6-6"}, "41110": {"index": 60, "text": "4.11.10"}, "41111": {"index": 61, "text": "4.11.11"}, "41112": {"index": 62, "text": "4.11.12"}, "41113": {"index": 63, "text": "4.11.13"}, "41114": {"index": 64, "text": "4.11.14"}, "41144": {"index": 78, "text": "4.11.4-4"}, "41159": {"index": 79, "text": "4.11.5-9"}, "41206": {"index": 65, "text": "4.12.0.6"}, "41207": {"index": 66, "text": "4.12.0.7"}, "41208": {"index": 67, "text": "4.12.0.8"}, "41218": {"index": 73, "text": "4.12.1-8"}, "41224": {"index": 85, "text": "4.12.2-4"}, "41304": {"index": 102, "text": "4.13.0-rc.4"}, "41305": {"index": 103, "text": "4.13.0-rc.5"}, "41307": {"index": 104, "text": "4.13.0-rc.7"}, "41308": {"index": 105, "text": "4.13.0-rc.8"}, "49211": {"index": 7, "text": "4.9.2-11"}, "410129": {"index": 22, "text": "4.10.1-29"}, "410136": {"index": 23, "text": "4.10.1-36"}, "410160": {"index": 24, "text": "4.10.1-60"}, "410170": {"index": 25, "text": "4.10.1-70"}, "410197": {"index": 26, "text": "4.10.1-97"}, "411115": {"index": 52, "text": "4.11.1-15"}, "411121": {"index": 51, "text": "4.11.1-21"}, "411135": {"index": 46, "text": "4.11.1-35"}, "411142": {"index": 47, "text": "4.11.1-42"}, "411605": {"index": 53, "text": "4.11.6-5"}, "412116": {"index": 74, "text": "4.12.1-16"}, "412119": {"index": 84, "text": "4.12.1-19"}, "412122": {"index": 75, "text": "4.12.1-22"}, "412139": {"index": 82, "text": "4.12.1-39"}, "412140": {"index": 81, "text": "4.12.1-40"}, "412317": {"index": 121, "text": "4.12.3-17"}, "413014": {"index": 101, "text": "4.13.0-ec.4"}, "413118": {"index": 113, "text": "4.13.1-18"}, "413140": {"index": 114, "text": "4.13.1-40"}, "4100683": {"index": 17, "text": "4.10.0-683"}, "4100688": {"index": 18, "text": "4.10.0-688"}, "4100700": {"index": 19, "text": "4.10.0-700"}, "4100729": {"index": 20, "text": "4.10.0-729"}, "4101101": {"index": 27, "text": "4.10.1-101"}, "4110137": {"index": 50, "text": "4.11.0-137"}, "4120173": {"index": 83, "text": "4.12.0-173"}, "4120777": {"index": 71, "text": "4.12.0-777"}, "4120781": {"index": 72, "text": "4.12.0-781"}, "4131154": {"index": 115, "text": "4.13.1-154"}, "41301586": {"index": 88, "text": "4.13.0-1586"}, "41301649": {"index": 89, "text": "4.13.0-1649"}, "41301666": {"index": 91, "text": "4.13.0-1666"}, "41301689": {"index": 90, "text": "4.13.0-1689"}, "41301782": {"index": 92, "text": "4.13.0-1782"}, "41301856": {"index": 93, "text": "4.13.0-1856"}, "41301938": {"index": 94, "text": "4.13.0-1938"}, "41301943": {"index": 95, "text": "4.13.0-1943"}, "41302115": {"index": 96, "text": "4.13.0-2115"}, "41302176": {"index": 97, "text": "4.13.0-2176"}, "41302229": {"index": 98, "text": "4.13.0-2229"}, "41302251": {"index": 99, "text": "4.13.0-2251"}, "41302269": {"index": 100, "text": "4.13.0-2269"}, "4130ec3": {"index": 87, "text": "4.13.0-ec.3"}, "CNV": {"index": 112, "text": "CNV"}, "KATA": {"index": 116, "text": "KATA"}, "OCP": {"index": 108, "text": "OCP"}, "ODF": {"index": 120, "text": "ODF"}, "Product Versions": {"index": 107, "text": "Product Versions"}, "4136": {"index": 122, "text": "4.13.6"}, "413360": {"index": 123, "text": "4.13.3-60"}, "41244": {"index": 126, "text": "4.12.4-4"}, "4134": {"index": 130, "text": "4.13.4"}, "4131206": {"index": 131, "text": "4.13.1-206"}, "4131214": {"index": 132, "text": "4.13.1-214"}, "41323": {"index": 133, "text": "4.13.2-3"}, "413273": {"index": 134, "text": "4.13.2-73"}, "41338": {"index": 135, "text": "4.13.3-8"}, "413267": {"index": 136, "text": "4.13.2-67"}, "4137": {"index": 137, "text": "4.13.7"}, "4133166": {"index": 138, "text": "4.13.3-166"}, "141": {"index": 139, "text": "1.4.1"}, "41252": {"index": 140, "text": "4.12.5-2"}, "4138": {"index": 141, "text": "4.13.8"}, "4133203": {"index": 142, "text": "4.13.3-203"}, "4139": {"index": 143, "text": "4.13.9"}, "413426": {"index": 145, "text": "4.13.4-26"}, "4133266": {"index": 146, "text": "4.13.3-266"}, "41310": {"index": 147, "text": "4.13.10"}, "413482": {"index": 148, "text": "4.13.4-82"}, "41263": {"index": 149, "text": "4.12.6-3"}, "41311": {"index": 150, "text": "4.13.11"}, "4134140": {"index": 151, "text": "4.13.4-140"}, "41272": {"index": 152, "text": "4.12.7-2"}, "41312": {"index": 153, "text": "4.13.12"}, "4134192": {"index": 154, "text": "4.13.4-192"}, "41313": {"index": 155, "text": "4.13.13"}, "4134237": {"index": 156, "text": "4.13.4-237"}, "41401": {"index": 157, "text": "4.14.0-rc.1"}, "41401991": {"index": 158, "text": "4.14.0-1991"}, "3132": {"index": 159, "text": "3.1.3-2"}, "41402040": {"index": 160, "text": "4.14.0-2040"}, "41402": {"index": 161, "text": "4.14.0-rc.2"}, "41402084": {"index": 162, "text": "4.14.0-2084"}, "41402117": {"index": 163, "text": "4.14.0-2117"}, "41336": {"index": 164, "text": "4.13.3-6"}, "41404": {"index": 165, "text": "4.14.0-rc.4"}, "41402178": {"index": 166, "text": "4.14.0-2178"}, "41402197": {"index": 167, "text": "4.14.0-2197"}, "41406": {"index": 168, "text": "4.14.0-rc.6"}, "41402245": {"index": 169, "text": "4.14.0-2245"}, "3134": {"index": 170, "text": "3.1.3-4"}, "41402256": {"index": 171, "text": "4.14.0-2256"}, "41402257": {"index": 172, "text": "4.14.0-2257"}, "41402258": {"index": 173, "text": "4.14.0-2258"}} + {"0": {"index": 0, "text": "fail"}, "1": {"index": 1, "text": "pass"}, "102": {"index": 13, "text": "1.0.2"}, "110": {"index": 14, "text": "1.1.0"}, "120": {"index": 15, "text": "1.2.0"}, "121": {"index": 16, "text": "1.2.1"}, "130": {"index": 45, "text": "1.3.0"}, "131": {"index": 117, "text": "1.3.1"}, "132": {"index": 76, "text": "1.3.2"}, "133": {"index": 77, "text": "1.3.3"}, "140": {"index": 118, "text": "1.4.0"}, "483": {"index": 0, "text": "4.8.3"}, "484": {"index": 1, "text": "4.8.4"}, "485": {"index": 2, "text": "4.8.5"}, "486": {"index": 3, "text": "4.8.6"}, "487": {"index": 4, "text": "4.8.7"}, "488": {"index": 5, "text": "4.8.8"}, "3025": {"index": 86, "text": "3.0.2-5"}, "3026": {"index": 119, "text": "3.0.2-6"}, "4102": {"index": 33, "text": "4.10.2"}, "4104": {"index": 34, "text": "4.10.4"}, "4105": {"index": 35, "text": "4.10.5"}, "4106": {"index": 36, "text": "4.10.6"}, "4108": {"index": 37, "text": "4.10.8"}, "4109": {"index": 38, "text": "4.10.9"}, "4114": {"index": 54, "text": "4.11.4"}, "4115": {"index": 55, "text": "4.11.5"}, "4116": {"index": 56, "text": "4.11.6"}, "4117": {"index": 57, "text": "4.11.7"}, "4118": {"index": 58, "text": "4.11.8"}, "4119": {"index": 59, "text": "4.11.9"}, "4120": {"index": 68, "text": "4.12.0"}, "4121": {"index": 69, "text": "4.12.1"}, "4122": {"index": 70, "text": "4.12.2"}, "4124": {"index": 80, "text": "4.12.4"}, "4130": {"index": 106, "text": "4.13.0"}, "4131": {"index": 109, "text": "4.13.1"}, "4132": {"index": 110, "text": "4.13.2"}, "4133": {"index": 111, "text": "4.13.3"}, "4814": {"index": 6, "text": "4.8.14"}, "4932": {"index": 8, "text": "4.9.3-2"}, "4947": {"index": 9, "text": "4.9.4-7"}, "4955": {"index": 10, "text": "4.9.5-5"}, "4961": {"index": 11, "text": "4.9.6-1"}, "4972": {"index": 12, "text": "4.9.7-2"}, "41002": {"index": 30, "text": "4.10.0-rc.2"}, "41003": {"index": 31, "text": "4.10.0-rc.3"}, "41007": {"index": 32, "text": "4.10.0-rc.7"}, "41010": {"index": 39, "text": "4.10.10"}, "41011": {"index": 40, "text": "4.10.11"}, "41012": {"index": 41, "text": "4.10.12"}, "41013": {"index": 42, "text": "4.10.13"}, "41014": {"index": 43, "text": "4.10.14"}, "41015": {"index": 44, "text": "4.10.15"}, "41016": {"index": 21, "text": "4.10.1-6"}, "41021": {"index": 28, "text": "4.10.2-1"}, "41023": {"index": 29, "text": "4.10.2-3"}, "41054": {"index": 49, "text": "4.10.5-4"}, "41066": {"index": 48, "text": "4.10.6-6"}, "41110": {"index": 60, "text": "4.11.10"}, "41111": {"index": 61, "text": "4.11.11"}, "41112": {"index": 62, "text": "4.11.12"}, "41113": {"index": 63, "text": "4.11.13"}, "41114": {"index": 64, "text": "4.11.14"}, "41144": {"index": 78, "text": "4.11.4-4"}, "41159": {"index": 79, "text": "4.11.5-9"}, "41206": {"index": 65, "text": "4.12.0.6"}, "41207": {"index": 66, "text": "4.12.0.7"}, "41208": {"index": 67, "text": "4.12.0.8"}, "41218": {"index": 73, "text": "4.12.1-8"}, "41224": {"index": 85, "text": "4.12.2-4"}, "41304": {"index": 102, "text": "4.13.0-rc.4"}, "41305": {"index": 103, "text": "4.13.0-rc.5"}, "41307": {"index": 104, "text": "4.13.0-rc.7"}, "41308": {"index": 105, "text": "4.13.0-rc.8"}, "49211": {"index": 7, "text": "4.9.2-11"}, "410129": {"index": 22, "text": "4.10.1-29"}, "410136": {"index": 23, "text": "4.10.1-36"}, "410160": {"index": 24, "text": "4.10.1-60"}, "410170": {"index": 25, "text": "4.10.1-70"}, "410197": {"index": 26, "text": "4.10.1-97"}, "411115": {"index": 52, "text": "4.11.1-15"}, "411121": {"index": 51, "text": "4.11.1-21"}, "411135": {"index": 46, "text": "4.11.1-35"}, "411142": {"index": 47, "text": "4.11.1-42"}, "411605": {"index": 53, "text": "4.11.6-5"}, "412116": {"index": 74, "text": "4.12.1-16"}, "412119": {"index": 84, "text": "4.12.1-19"}, "412122": {"index": 75, "text": "4.12.1-22"}, "412139": {"index": 82, "text": "4.12.1-39"}, "412140": {"index": 81, "text": "4.12.1-40"}, "412317": {"index": 121, "text": "4.12.3-17"}, "413014": {"index": 101, "text": "4.13.0-ec.4"}, "413118": {"index": 113, "text": "4.13.1-18"}, "413140": {"index": 114, "text": "4.13.1-40"}, "4100683": {"index": 17, "text": "4.10.0-683"}, "4100688": {"index": 18, "text": "4.10.0-688"}, "4100700": {"index": 19, "text": "4.10.0-700"}, "4100729": {"index": 20, "text": "4.10.0-729"}, "4101101": {"index": 27, "text": "4.10.1-101"}, "4110137": {"index": 50, "text": "4.11.0-137"}, "4120173": {"index": 83, "text": "4.12.0-173"}, "4120777": {"index": 71, "text": "4.12.0-777"}, "4120781": {"index": 72, "text": "4.12.0-781"}, "4131154": {"index": 115, "text": "4.13.1-154"}, "41301586": {"index": 88, "text": "4.13.0-1586"}, "41301649": {"index": 89, "text": "4.13.0-1649"}, "41301666": {"index": 91, "text": "4.13.0-1666"}, "41301689": {"index": 90, "text": "4.13.0-1689"}, "41301782": {"index": 92, "text": "4.13.0-1782"}, "41301856": {"index": 93, "text": "4.13.0-1856"}, "41301938": {"index": 94, "text": "4.13.0-1938"}, "41301943": {"index": 95, "text": "4.13.0-1943"}, "41302115": {"index": 96, "text": "4.13.0-2115"}, "41302176": {"index": 97, "text": "4.13.0-2176"}, "41302229": {"index": 98, "text": "4.13.0-2229"}, "41302251": {"index": 99, "text": "4.13.0-2251"}, "41302269": {"index": 100, "text": "4.13.0-2269"}, "4130ec3": {"index": 87, "text": "4.13.0-ec.3"}, "CNV": {"index": 112, "text": "CNV"}, "KATA": {"index": 116, "text": "KATA"}, "OCP": {"index": 108, "text": "OCP"}, "ODF": {"index": 120, "text": "ODF"}, "Product Versions": {"index": 107, "text": "Product Versions"}, "4136": {"index": 122, "text": "4.13.6"}, "413360": {"index": 123, "text": "4.13.3-60"}, "41244": {"index": 126, "text": "4.12.4-4"}, "4134": {"index": 130, "text": "4.13.4"}, "4131206": {"index": 131, "text": "4.13.1-206"}, "4131214": {"index": 132, "text": "4.13.1-214"}, "41323": {"index": 133, "text": "4.13.2-3"}, "413273": {"index": 134, "text": "4.13.2-73"}, "41338": {"index": 135, "text": "4.13.3-8"}, "413267": {"index": 136, "text": "4.13.2-67"}, "4137": {"index": 137, "text": "4.13.7"}, "4133166": {"index": 138, "text": "4.13.3-166"}, "141": {"index": 139, "text": "1.4.1"}, "41252": {"index": 140, "text": "4.12.5-2"}, "4138": {"index": 141, "text": "4.13.8"}, "4133203": {"index": 142, "text": "4.13.3-203"}, "4139": {"index": 143, "text": "4.13.9"}, "413426": {"index": 145, "text": "4.13.4-26"}, "4133266": {"index": 146, "text": "4.13.3-266"}, "41310": {"index": 147, "text": "4.13.10"}, "413482": {"index": 148, "text": "4.13.4-82"}, "41263": {"index": 149, "text": "4.12.6-3"}, "41311": {"index": 150, "text": "4.13.11"}, "4134140": {"index": 151, "text": "4.13.4-140"}, "41272": {"index": 152, "text": "4.12.7-2"}, "41312": {"index": 153, "text": "4.13.12"}, "4134192": {"index": 154, "text": "4.13.4-192"}, "41313": {"index": 155, "text": "4.13.13"}, "4134237": {"index": 156, "text": "4.13.4-237"}, "41401": {"index": 157, "text": "4.14.0-rc.1"}, "41401991": {"index": 158, "text": "4.14.0-1991"}, "3132": {"index": 159, "text": "3.1.3-2"}, "41402040": {"index": 160, "text": "4.14.0-2040"}, "41402": {"index": 161, "text": "4.14.0-rc.2"}, "41402084": {"index": 162, "text": "4.14.0-2084"}, "41402117": {"index": 163, "text": "4.14.0-2117"}, "41336": {"index": 164, "text": "4.13.3-6"}, "41404": {"index": 165, "text": "4.14.0-rc.4"}, "41402178": {"index": 166, "text": "4.14.0-2178"}, "41402197": {"index": 167, "text": "4.14.0-2197"}, "41406": {"index": 168, "text": "4.14.0-rc.6"}, "41402245": {"index": 169, "text": "4.14.0-2245"}, "3134": {"index": 170, "text": "3.1.3-4"}, "41402256": {"index": 171, "text": "4.14.0-2256"}, "41402257": {"index": 172, "text": "4.14.0-2257"}, "41402258": {"index": 173, "text": "4.14.0-2258"}, "41407": {"index": 174, "text": "4.14.0-rc.7"}, "41402337": {"index": 175, "text": "4.14.0-2337"}, "41348": {"index": 176, "text": "4.13.4-8"}, "4141": {"index": 177, "text": "4.14.1"}, "41402356": {"index": 178, "text": "4.14.0-2356"}} //END_VALUE_MAPPING_227 ) + stateTimeline.valueMapping.RegexMap.withType('value') @@ -4914,16 +4914,6 @@ g.dashboard.new('PerfCI-Regression-Summary') - - - - - - - - - - ////////////////////////////////////////////////////// @@ -4981,7 +4971,7 @@ g.dashboard.new('PerfCI-Regression-Summary') + stateTimeline.standardOptions.withUnit('none') + stateTimeline.fieldConfig.withOverrides([]) - + stateTimeline.gridPos.withH(19) + + stateTimeline.gridPos.withH(10) + stateTimeline.gridPos.withW(24) + stateTimeline.gridPos.withX(0) + stateTimeline.gridPos.withY(187) @@ -5005,6 +4995,7 @@ g.dashboard.new('PerfCI-Regression-Summary') + stateTimeline.options.tooltip.withMode('single') + g.panel.stateTimeline.withTargets([ + //// elasticsearch.withAlias('Min') + elasticsearch.withBucketAggs([ @@ -5040,42 +5031,6 @@ g.dashboard.new('PerfCI-Regression-Summary') //// - elasticsearch.withAlias('Max') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('B') - + elasticsearch.withTimeField('timestamp'), - - //// - - elasticsearch.withAlias('') + elasticsearch.withBucketAggs([ @@ -5100,102 +5055,19 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['25', '50', '75', '95', '99']) + + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['50', '90']) + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withType('percentiles') ]) + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('C') - + elasticsearch.withTimeField('timestamp'), - - //// - - - elasticsearch.withAlias('AVG. 100 vms {{term node.keyword}}') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.Terms.withField('node.keyword') - + elasticsearch.bucketAggs.Terms.withId('4') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('asc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Average.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withType('avg') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('D') - + elasticsearch.withTimeField('timestamp'), - - - //// - - - - elasticsearch.withAlias('%CPU [240 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('total_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('E') + + elasticsearch.withRefId('B') + elasticsearch.withTimeField('timestamp'), - //// - + /// - elasticsearch.withAlias('%CPU worker-0 [80 cores]') + elasticsearch.withAlias('Max') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5217,91 +5089,91 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.withHide(false) + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-0_CPU') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) + + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') ]) + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('F') + + elasticsearch.withRefId('C') + elasticsearch.withTimeField('timestamp'), //// + ]), + //////////////////////// - elasticsearch.withAlias('%CPU worker-1 [80 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) + g.panel.stateTimeline.new('') + + stateTimeline.queryOptions.withDatasource('Elasticsearch-bootstorm-results') + + g.panel.stateTimeline.withDescription('Time till VM Login - Lower is better') - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-1_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') + + stateTimeline.standardOptions.color.withMode('thresholds') + + stateTimeline.fieldConfig.defaults.custom.withFillOpacity(77) + + stateTimeline.fieldConfig.defaults.custom.withLineWidth(0) - ]) + + stateTimeline.fieldConfig.defaults.withDecimals(1) + + stateTimeline.fieldConfig.defaults.withMappings([ + stateTimeline.valueMapping.ValueMap.withOptions( + { + "0": { + "color": "transparent", + "index": 0, + "text": "." + } + } + ) + + stateTimeline.valueMapping.ValueMap.withType('value') - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('G') - + elasticsearch.withTimeField('timestamp'), + ]) + + stateTimeline.standardOptions.withMax(-1) + + stateTimeline.fieldConfig.defaults.thresholds.withMode('percentage') + + stateTimeline.fieldConfig.defaults.thresholds.withSteps([ + stateTimeline.thresholdStep.withColor('red'), - //// + stateTimeline.thresholdStep.withColor('semi-dark-orange') + + stateTimeline.thresholdStep.withValue(50), - elasticsearch.withAlias('%CPU worker-2 [80 cores]') + stateTimeline.thresholdStep.withColor('super-light-green') + + stateTimeline.thresholdStep.withValue(80), - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), + stateTimeline.thresholdStep.withColor('dark-green') + + stateTimeline.thresholdStep.withValue(90), - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') + stateTimeline.thresholdStep.withColor('dark-blue') + + stateTimeline.thresholdStep.withValue(100) + ]) + + stateTimeline.standardOptions.withUnit('none') + + stateTimeline.fieldConfig.withOverrides([]) - ]) + + stateTimeline.gridPos.withH(3) + + stateTimeline.gridPos.withW(24) + + stateTimeline.gridPos.withX(0) + + stateTimeline.gridPos.withY(187) - + elasticsearch.withHide(false) + + stateTimeline.withId(178) + + stateTimeline.withInterval('1d') - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-2_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') + + stateTimeline.panelOptions.withLinks([ + stateTimeline.link.withTargetBlank(true) + + stateTimeline.link.withTitle('artifacts link') + + stateTimeline.link.withUrl('https://grafana-perf-chmf648sh776bznl3b.ibm.rhperfscale.org/d/T4775LKnzzmichey/perfci-regression-summary?orgId=1&from=now-45d&to=now&viewPanel=43') - ]) + ]) - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('H') - + elasticsearch.withTimeField('timestamp'), + + stateTimeline.options.withAlignValue('center') + + stateTimeline.options.legend.withDisplayMode('hidden') + + stateTimeline.options.legend.withPlacement('bottom') + + stateTimeline.options.withMergeValues(value = false) + + stateTimeline.options.withRowHeight(value = 0.9) + + stateTimeline.options.withShowValue('always') + + stateTimeline.options.tooltip.withMode('single') + + g.panel.stateTimeline.withTargets([ //// - - elasticsearch.withAlias('VMs #') + elasticsearch.withAlias('VMs #: Fedora') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5329,13 +5201,14 @@ g.dashboard.new('PerfCI-Regression-Summary') ]) + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('I') + + elasticsearch.withRefId('A') + elasticsearch.withTimeField('timestamp') //// ]), + //////////////////////// g.panel.stateTimeline.new('240 Fedora37 VM Memory') @@ -5450,7 +5323,7 @@ g.dashboard.new('PerfCI-Regression-Summary') //////////////////////// - g.panel.stateTimeline.new('120 Windows Server 2019 VMs virtio (Sec)') + g.panel.stateTimeline.new('120 Windows VMs virtio (Sec)') + stateTimeline.queryOptions.withDatasource('Elasticsearch-windows-results') + g.panel.stateTimeline.withDescription('Time till VM Login - Lower is better') @@ -5517,7 +5390,8 @@ g.dashboard.new('PerfCI-Regression-Summary') + stateTimeline.options.tooltip.withMode('single') + g.panel.stateTimeline.withTargets([ - elasticsearch.withAlias('Min') + //// + elasticsearch.withAlias('Min: {{term vm_os_version.keyword}}') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5528,6 +5402,14 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + + elasticsearch.bucketAggs.Terms.withId('4') + + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withSize('10') + + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.DateHistogram.withField('timestamp') + elasticsearch.bucketAggs.DateHistogram.withId('2') + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') @@ -5552,7 +5434,7 @@ g.dashboard.new('PerfCI-Regression-Summary') //// - elasticsearch.withAlias('Max') + elasticsearch.withAlias('') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5563,36 +5445,8 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('B') - + elasticsearch.withTimeField('timestamp'), - - //// - - - elasticsearch.withAlias('') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + + elasticsearch.bucketAggs.Terms.withId('4') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') @@ -5612,20 +5466,19 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['25', '50', '75', '95', '99']) + + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['50', '90']) + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withType('percentiles') ]) + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('C') + + elasticsearch.withRefId('B') + elasticsearch.withTimeField('timestamp'), //// - - elasticsearch.withAlias('AVG. 40 vms {{term node.keyword}}') + elasticsearch.withAlias('Max: {{term vm_os_version.keyword}}') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5636,47 +5489,9 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), - elasticsearch.bucketAggs.Terms.withField('node.keyword') + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + elasticsearch.bucketAggs.Terms.withId('4') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('asc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Average.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withType('avg') - - ]) - - + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('D') - + elasticsearch.withTimeField('timestamp'), - - - //// - - - - elasticsearch.withAlias('%CPU [240 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + elasticsearch.bucketAggs.Terms.settings.withSize('10') @@ -5693,92 +5508,93 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.withHide(false) + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('total_CPU') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) + + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') ]) + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('E') + + elasticsearch.withRefId('C') + elasticsearch.withTimeField('timestamp'), //// - elasticsearch.withAlias('%CPU worker-0 [80 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) + ]), + //////////////////////// - + elasticsearch.withHide(false) + g.panel.stateTimeline.new('') + + stateTimeline.queryOptions.withDatasource('Elasticsearch-windows-results') + + g.panel.stateTimeline.withDescription('Time till VM Login - Lower is better') - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-0_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') + + stateTimeline.standardOptions.color.withMode('thresholds') + + stateTimeline.fieldConfig.defaults.custom.withFillOpacity(77) + + stateTimeline.fieldConfig.defaults.custom.withLineWidth(0) - ]) + + stateTimeline.fieldConfig.defaults.withDecimals(1) + + stateTimeline.fieldConfig.defaults.withMappings([ + stateTimeline.valueMapping.ValueMap.withOptions( + { + "0": { + "color": "transparent", + "index": 0, + "text": "." + } + } + ) + + stateTimeline.valueMapping.ValueMap.withType('value') - + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('F') - + elasticsearch.withTimeField('timestamp'), + ]) + + stateTimeline.standardOptions.withMax(-1) + + stateTimeline.fieldConfig.defaults.thresholds.withMode('percentage') + + stateTimeline.fieldConfig.defaults.thresholds.withSteps([ + stateTimeline.thresholdStep.withColor('red'), - //// + stateTimeline.thresholdStep.withColor('semi-dark-orange') + + stateTimeline.thresholdStep.withValue(50), + stateTimeline.thresholdStep.withColor('super-light-green') + + stateTimeline.thresholdStep.withValue(80), - elasticsearch.withAlias('%CPU worker-1 [80 cores]') + stateTimeline.thresholdStep.withColor('dark-green') + + stateTimeline.thresholdStep.withValue(90), - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), + stateTimeline.thresholdStep.withColor('dark-blue') + + stateTimeline.thresholdStep.withValue(100) - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') + ]) + + stateTimeline.standardOptions.withUnit('none') + + stateTimeline.fieldConfig.withOverrides([]) + + stateTimeline.gridPos.withH(5) - ]) + + stateTimeline.gridPos.withW(24) + + stateTimeline.gridPos.withX(0) + + stateTimeline.gridPos.withY(206) - + elasticsearch.withHide(false) + + stateTimeline.withId(193) + + stateTimeline.withInterval('1d') - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-1_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') + + stateTimeline.panelOptions.withLinks([ + stateTimeline.link.withTargetBlank(true) + + stateTimeline.link.withTitle('artifacts link') + + stateTimeline.link.withUrl('https://grafana-perf-chmf648sh776bznl3b.ibm.rhperfscale.org/d/T4775LKnzzmichey/perfci-regression-summary?orgId=1&from=now-45d&to=now&viewPanel=44') - ]) + ]) - + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('G') - + elasticsearch.withTimeField('timestamp'), + + stateTimeline.options.withAlignValue('center') + + stateTimeline.options.legend.withDisplayMode('hidden') + + stateTimeline.options.legend.withPlacement('bottom') + + stateTimeline.options.withMergeValues(value = false) + + stateTimeline.options.withRowHeight(value = 0.9) + + stateTimeline.options.withShowValue('always') + + stateTimeline.options.tooltip.withMode('single') - //// + + g.panel.stateTimeline.withTargets([ - elasticsearch.withAlias('%CPU worker-2 [80 cores]') + elasticsearch.withAlias('VMs #: {{term vm_os_version.keyword}}') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5789,35 +5605,8 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-2_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('H') - + elasticsearch.withTimeField('timestamp'), - - //// - - elasticsearch.withAlias('VMs #') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + + elasticsearch.bucketAggs.Terms.withId('4') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') @@ -5841,24 +5630,16 @@ g.dashboard.new('PerfCI-Regression-Summary') ]) + elasticsearch.withQuery('scale:120 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('I') + + elasticsearch.withRefId('A') + elasticsearch.withTimeField('timestamp') //// - - - - - - - ]), //////////////////////// - - g.panel.stateTimeline.new('120 Windows Server 2019 VM Memory') + g.panel.stateTimeline.new('120 Windows VM Memory') + stateTimeline.queryOptions.withDatasource('Elasticsearch-windows-results') + g.panel.stateTimeline.withDescription('Time till VM Login - Lower is better') @@ -5901,7 +5682,8 @@ g.dashboard.new('PerfCI-Regression-Summary') + stateTimeline.standardOptions.withUnit('none') + stateTimeline.fieldConfig.withOverrides([]) - + stateTimeline.gridPos.withH(5) + + stateTimeline.gridPos.withH(9) + + stateTimeline.gridPos.withW(24) + stateTimeline.gridPos.withX(0) + stateTimeline.gridPos.withY(206) @@ -5928,7 +5710,7 @@ g.dashboard.new('PerfCI-Regression-Summary') //// - elasticsearch.withAlias('{{field}} [GB]') + elasticsearch.withAlias('{{field}} [GB]: {{term vm_os_version.keyword}}') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5939,6 +5721,14 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + + elasticsearch.bucketAggs.Terms.withId('4') + + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withSize('10') + + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.DateHistogram.withField('timestamp') + elasticsearch.bucketAggs.DateHistogram.withId('2') + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') @@ -6880,17 +6670,6 @@ g.dashboard.new('PerfCI-Regression-Summary') + g.panel.table.fieldOverride.byName.withProperty('custom.width',1000) + g.panel.table.fieldOverride.byName.withProperty('displayName','Artifacts Link'), - g.panel.table.fieldOverride.byName.new('Average') - + g.panel.table.fieldOverride.byName.withProperty('displayName','Average Rate'), - - g.panel.table.fieldOverride.byName.new('Run.keyword') - + g.panel.table.fieldOverride.byName.withProperty('custom.width',140) - + g.panel.table.fieldOverride.byName.withProperty('displayName','Run'), - - g.panel.table.fieldOverride.byName.new('Threads') - + g.panel.table.fieldOverride.byName.withProperty('custom.width',100) - + g.panel.table.fieldOverride.byName.withProperty('displayName','Thread') - ]) @@ -7021,21 +6800,18 @@ g.dashboard.new('PerfCI-Regression-Summary') + g.panel.table.fieldOverride.byName.withProperty('custom.width',100) + g.panel.table.fieldOverride.byName.withProperty('displayName','Kind'), + g.panel.table.fieldOverride.byName.new('scale') + + g.panel.table.fieldOverride.byName.withProperty('custom.width',100) + + g.panel.table.fieldOverride.byName.withProperty('displayName','Scale'), + + g.panel.table.fieldOverride.byName.new('vm_os_version.keyword') + + g.panel.table.fieldOverride.byName.withProperty('custom.width',200) + + g.panel.table.fieldOverride.byName.withProperty('displayName','OS Version'), + g.panel.table.fieldOverride.byName.new('run_artifacts_url.keyword') + g.panel.table.fieldOverride.byName.withProperty('custom.width',1000) + g.panel.table.fieldOverride.byName.withProperty('displayName','Artifacts Link'), - g.panel.table.fieldOverride.byName.new('Average') - + g.panel.table.fieldOverride.byName.withProperty('displayName','Average Rate'), - - g.panel.table.fieldOverride.byName.new('Run.keyword') - + g.panel.table.fieldOverride.byName.withProperty('custom.width',140) - + g.panel.table.fieldOverride.byName.withProperty('displayName','Run'), - - g.panel.table.fieldOverride.byName.new('Threads') - + g.panel.table.fieldOverride.byName.withProperty('custom.width',100) - + g.panel.table.fieldOverride.byName.withProperty('displayName','Thread') - ]) + g.panel.table.gridPos.withH(5) @@ -7084,8 +6860,16 @@ g.dashboard.new('PerfCI-Regression-Summary') + elasticsearch.bucketAggs.Terms.settings.withSize('10') + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.Terms.withField('vm_os_version.keyword') + + elasticsearch.bucketAggs.Terms.withId('11') + + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withSize('10') + + elasticsearch.bucketAggs.Terms.withType('terms'), + elasticsearch.bucketAggs.DateHistogram.withField('run_artifacts_url.keyword') - + elasticsearch.bucketAggs.DateHistogram.withId('11') + + elasticsearch.bucketAggs.DateHistogram.withId('12') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') @@ -7116,11 +6900,6 @@ g.dashboard.new('PerfCI-Regression-Summary') }) - - - - - ]), ///////////// diff --git a/benchmark_runner/workloads/workloads_operations.py b/benchmark_runner/workloads/workloads_operations.py index 6b8d24b53..1ca5560a7 100644 --- a/benchmark_runner/workloads/workloads_operations.py +++ b/benchmark_runner/workloads/workloads_operations.py @@ -98,6 +98,9 @@ def __init__(self): self._snapshot = PrometheusSnapshot(oc=self._oc, artifacts_path=self._run_artifacts_path, verbose=True) self._prometheus_snap_interval = self._environment_variables_dict.get('prometheus_snap_interval', '') self._prometheus_metrics_operation = PrometheusMetricsOperation() + if self._environment_variables_dict.get('windows_url', ''): + file_name = os.path.basename(self._environment_variables_dict.get('windows_url', '')) + self._windows_os = os.path.splitext(file_name)[0] def __get_workload_file_name(self, workload): """ @@ -365,7 +368,7 @@ def __get_metadata(self, kind: str = None, status: str = None, result: dict = No if 'bootstorm' in self._workload: metadata.update({'vm_os_version': 'fedora37'}) if 'windows' in self._workload: - metadata.update({'vm_os_version': 'windows_server_2019'}) + metadata.update({'vm_os_version': self._windows_os}) if result: metadata.update(result) diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/func_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/perf_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/release_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_False/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_dv.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_dv.yaml index aa2010e66..c9d6e185a 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_dv.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_dv.yaml @@ -14,6 +14,6 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd \ No newline at end of file diff --git a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml index 3513ad4ab..3d6fcbcda 100644 --- a/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml +++ b/tests/unittest/benchmark_runner/common/template_operations/golden_files/test_ci_windows_vm_ODF_PVC_True/windows_vm.yaml @@ -1,4 +1,4 @@ -apiVersion: kubevirt.io/v1alpha3 +apiVersion: kubevirt.io/v1 kind: VirtualMachine metadata: name: windows-vm-deadbeef @@ -17,6 +17,12 @@ spec: terminationGracePeriodSeconds: 0 evictionStrategy: LiveMigrate domain: + features: + smm: {} + firmware: + bootloader: + efi: + secureBoot: false clock: timer: hpet: @@ -43,11 +49,12 @@ spec: - masquerade: {} model: virtio name: nic-0 + networkInterfaceMultiqueue: true + tpm: { } features: acpi: {} apic: {} hyperv: - evmcs: {} frequencies: {} ipi: {} reenlightenment: {} @@ -58,7 +65,8 @@ spec: spinlocks: spinlocks: 8191 synic: {} - synictimer: {} + synictimer: + direct: {} vapic: {} vpindex: {} machine: @@ -89,7 +97,7 @@ spec: - ReadWriteMany resources: requests: - storage: 40Gi + storage: 70Gi volumeMode: Block storageClassName: ocs-storagecluster-ceph-rbd source: