Temp roll-back: small SKUs, no deletion

Azure · Feb 3, 2025 · d570730 · d570730
1 parent 04df32f
commit d570730
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 97 deletions.
diff --git a/jobs/competitive-test.yml b/jobs/competitive-test.yml
@@ -97,10 +97,3 @@ jobs:
       regions: ${{ parameters.regions }}
       engine_input: ${{ parameters.engine_input }}
       credential_type: ${{ parameters.credential_type }}
-  - template: /steps/cleanup-resources.yml
-    parameters:
-      cloud: ${{ parameters.cloud }}
-      regions: ${{ parameters.regions }}
-      terraform_arguments: ${{ parameters.terraform_arguments }}
-      retry_attempt_count: ${{ parameters.retry_attempt_count }}
-      credential_type: ${{ parameters.credential_type }}
diff --git a/pipelines/perf-eval/CRI Benchmark/cri-clusterloader2-immut-host.yml b/pipelines/perf-eval/CRI Benchmark/cri-clusterloader2-immut-host.yml
@@ -6,14 +6,14 @@ variables:
   SCENARIO_VERSION: main
 
 stages:
-  - stage: azure_swedencentral
+  - stage: azure_eastus
     dependsOn: []
     jobs:
       - template: /jobs/competitive-test.yml
         parameters:
           cloud: azure
           regions:
-            - swedencentral
+            - eastus
           engine: clusterloader2
           engine_input:
             image: "ghcr.io/azure/clusterloader2:v20241016"
@@ -25,90 +25,7 @@ stages:
               repeats: 1
               operation_timeout: 3m
               load_type: memory
-            n10-p700-memory:
-              node_count: 10
-              max_pods: 70
-              repeats: 1
-              operation_timeout: 7m
-              load_type: memory
-            n10-p1100-memory:
-              node_count: 10
-              max_pods: 110
-              repeats: 1
-              operation_timeout: 11m
-              load_type: memory
-            n10-p300-cpu:
-              node_count: 10
-              max_pods: 30
-              repeats: 1
-              operation_timeout: 3m
-              load_type: cpu
-            n10-p700-cpu:
-              node_count: 10
-              max_pods: 70
-              repeats: 1
-              operation_timeout: 7m
-              load_type: cpu
-            n10-p1100-cpu:
-              node_count: 10
-              max_pods: 110
-              repeats: 1
-              operation_timeout: 11m
-              load_type: cpu
-          max_parallel: 3
-          timeout_in_minutes: 120
-          credential_type: service_connection
-          ssh_key_enabled: false
-  - stage: aws_westeurope
-    dependsOn: []
-    jobs:
-      - template: /jobs/competitive-test.yml
-        parameters:
-          cloud: aws
-          regions:
-            - eu-west-1
-          engine: clusterloader2
-          engine_input:
-            image: "ghcr.io/azure/clusterloader2:v20241016"
-          topology: cri-resource-consume
-          matrix:
-            n10-p300-memory:
-              node_count: 10
-              max_pods: 30
-              repeats: 1
-              operation_timeout: 3m
-              load_type: memory
-            n10-p700-memory:
-              node_count: 10
-              max_pods: 70
-              repeats: 1
-              operation_timeout: 7m
-              load_type: memory
-            n10-p1100-memory:
-              node_count: 10
-              max_pods: 110
-              repeats: 1
-              operation_timeout: 11m
-              load_type: memory
-            n10-p300-cpu:
-              node_count: 10
-              max_pods: 30
-              repeats: 1
-              operation_timeout: 3m
-              load_type: cpu
-            n10-p700-cpu:
-              node_count: 10
-              max_pods: 70
-              repeats: 1
-              operation_timeout: 7m
-              load_type: cpu
-            n10-p1100-cpu:
-              node_count: 10
-              max_pods: 110
-              repeats: 1
-              operation_timeout: 11m
-              load_type: cpu
-          max_parallel: 3
+          max_parallel: 1
           timeout_in_minutes: 120
           credential_type: service_connection
           ssh_key_enabled: false
diff --git a/scenarios/perf-eval/cri-clusterloader2-immut-host/terraform-inputs/azure.tfvars b/scenarios/perf-eval/cri-clusterloader2-immut-host/terraform-inputs/azure.tfvars
@@ -37,7 +37,7 @@ aks_cli_config_list = [
     default_node_pool = {
       name                         = "default"
       node_count                   = 3
-      vm_size                      = "Standard_D16_v3"
+      vm_size                      = "Standard_D2_v4"
       os_disk_type                 = "Managed"
       only_critical_addons_enabled = true
       temporary_name_for_rotation  = "defaulttmp"
@@ -47,15 +47,14 @@ aks_cli_config_list = [
         name                 = "prompool"
         node_count           = 1
         auto_scaling_enabled = false
-        vm_size              = "Standard_D16_v3"
+        vm_size              = "Standard_D16_v4"
         node_labels          = { "prometheus" = "true" }
       },
       {
         name                 = "userpool0"
         node_count           = 10
         auto_scaling_enabled = false
-        vm_size              = "Standard_D16_v3"
-        node_taints          = ["cri-resource-consume=true:NoSchedule"]
+        vm_size              = "Standard_D2_v4"
         node_labels          = { "cri-resource-consume" = "true" }
       }
     ]