diff --git a/pipelines/perf-eval/apiserver-benchmark-virtualnodes10-pods100.yml b/pipelines/perf-eval/apiserver-benchmark-virtualnodes10-pods100.yml index e445033bd..7e5451e60 100644 --- a/pipelines/perf-eval/apiserver-benchmark-virtualnodes10-pods100.yml +++ b/pipelines/perf-eval/apiserver-benchmark-virtualnodes10-pods100.yml @@ -40,7 +40,7 @@ stages: timeout_in_minutes: 360 credential_type: service_connection ssh_key_enabled: false - - stage: azure_eastus2 + - stage: azure_eastus2_free dependsOn: [] jobs: - template: /jobs/competitive-test.yml @@ -54,9 +54,38 @@ stages: workload-low: flowcontrol: "workload-low:1000" extra_benchmark_subcmd_args: "" + sku_tier: Free exempt: flowcontrol: "exempt:5" extra_benchmark_subcmd_args: "" + sku_tier: Free + engine_input: + runner_image: telescope.azurecr.io/oss/kperf:v0.1.5 + benchmark_subcmd: node10_job1_pod100 + benchmark_subcmd_args: "--total 1000" + max_parallel: 2 + timeout_in_minutes: 360 + credential_type: service_connection + ssh_key_enabled: false + - stage: azure_eastus2_standard + dependsOn: [] + jobs: + - template: /jobs/competitive-test.yml + parameters: + cloud: azure + regions: + - eastus2 + engine: kperf + topology: kperf + matrix: + workload-low: + flowcontrol: "workload-low:1000" + extra_benchmark_subcmd_args: "" + sku_tier: Standard + exempt: + flowcontrol: "exempt:5" + extra_benchmark_subcmd_args: "" + sku_tier: Standard engine_input: runner_image: telescope.azurecr.io/oss/kperf:v0.1.5 benchmark_subcmd: node10_job1_pod100 diff --git a/steps/cloud/azure/collect-cloud-info.yml b/steps/cloud/azure/collect-cloud-info.yml index 64651a222..d6f338ead 100644 --- a/steps/cloud/azure/collect-cloud-info.yml +++ b/steps/cloud/azure/collect-cloud-info.yml @@ -15,8 +15,9 @@ steps: --arg region "$(echo $aks_info | jq -r .location)" \ --arg fqdn "$(echo $aks_info | jq -r .fqdn)" \ --arg k8s_version "$(echo $aks_info | jq -r .currentKubernetesVersion)" \ + --arg sku_tier "$(echo $aks_info | jq -r .sku.tier)" \ --arg subscription "$(az account show --query id --output tsv)" \ - '{cloud: $cloud, region: $region, fqdn: $fqdn, k8s_version: $k8s_version, subscription: $subscription}') + '{cloud: $cloud, region: $region, fqdn: $fqdn, k8s_version: $k8s_version, sku_tier: $sku_tier, subscription: $subscription}') cloud_info_str=$(echo $cloud_info | jq -c .) echo "Cloud info: $cloud_info_str" echo "##vso[task.setvariable variable=CLOUD_INFO;]$cloud_info_str"