add parameter fix

Author: vittoriasalim

pipelines/perf-eval/Controller/job-scheduling.yml

@@ -6,45 +6,14 @@ variables:
   SCENARIO_VERSION: main
 
 stages:
-  # - stage: azure_eastus2
-  #   dependsOn: []
-  #   jobs:
-  #     - template: /jobs/competitive-test.yml
-  #       parameters:
-  #         cloud: azure
-  #         regions:
-  #           - eastus2
-  #         engine: clusterloader2
-  #         engine_input:
-  #           image: "ghcr.io/azure/clusterloader2:v20241022"
-  #         topology: kwok
-  #         matrix:
-  #           default:
-  #             cpu_per_node: 1
-  #             node_count: 20
-  #             node_per_step: 5
-  #             cilium_enabled: false
-  #             max_pods: 50
-  #             repeats: 1
-  #             scale_timeout: "15m"
-  #             service_test: true
-  #             cl2_config_file: config.yaml
-  #             job_count: 20000
-  #             qps: 200
-  #             kwok_nodes: 2000
-  #         max_parallel: 1
-  #         timeout_in_minutes: 360
-  #         credential_type: service_connection
-  #         ssh_key_enabled: false
-
-  - stage: aws_eastus2
+  - stage: azure_eastus2
     dependsOn: []
     jobs:
       - template: /jobs/competitive-test.yml
         parameters:
-          cloud: aws
+          cloud: azure
           regions:
-            - us-east-2
+            - eastus2
           engine: clusterloader2
           engine_input:
             image: "ghcr.io/azure/clusterloader2:v20241022"
@@ -67,3 +36,34 @@ stages:
           timeout_in_minutes: 360
           credential_type: service_connection
           ssh_key_enabled: false
+
+  # - stage: aws_eastus2
+  #   dependsOn: []
+  #   jobs:
+  #     - template: /jobs/competitive-test.yml
+  #       parameters:
+  #         cloud: aws
+  #         regions:
+  #           - us-east-2
+  #         engine: clusterloader2
+  #         engine_input:
+  #           image: "ghcr.io/azure/clusterloader2:v20241022"
+  #         topology: kwok
+  #         matrix:
+  #           default:
+  #             cpu_per_node: 1
+  #             node_count: 20
+  #             node_per_step: 5
+  #             cilium_enabled: false
+  #             max_pods: 50
+  #             repeats: 1
+  #             scale_timeout: "15m"
+  #             service_test: true
+  #             cl2_config_file: config.yaml
+  #             kwok_nodes: 10
+  #             qps: 20
+  #             job_count: 1000
+  #         max_parallel: 1
+  #         timeout_in_minutes: 360
+  #         credential_type: service_connection
+  #         ssh_key_enabled: false

steps/engine/clusterloader2/default/execute.yml

@@ -16,7 +16,7 @@ steps:
       echo $JOB_COUNT
 
       PYTHONPATH=$PYTHONPATH:$(pwd) python3 $PYTHON_SCRIPT_FILE configure \
-        $KWOK_NODES $ QPS $JOB_COUNT $CPU_PER_NODE $NODE_COUNT $NODE_PER_STEP ${MAX_PODS:-0} \
+        $KWOK_NODES $QPS $JOB_COUNT $CPU_PER_NODE $NODE_COUNT $NODE_PER_STEP ${MAX_PODS:-0} \
         $REPEATS $SCALE_TIMEOUT $CLOUD $CILIUM_ENABLED \
         $SERVICE_TEST ${CNP_TEST:-False} ${CCNP_TEST:-False} ${NUM_CNPS:-0} ${NUM_CCNPS:-0} ${DUALSTACK:-False} ${CL2_CONFIG_DIR}/overrides.yaml 
       PYTHONPATH=$PYTHONPATH:$(pwd) python3 $PYTHON_SCRIPT_FILE execute \