Adding workers-scale as a reusable step into self-managed AWS

ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.16-nightly-x86.yaml

@@ -21,8 +21,8 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "117"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "120"
       COMPUTE_NODE_TYPE: m5.xlarge
       ENABLE_LOCAL_INDEX: "true"
       EXTRA_FLAGS: --churn-duration=20m --service-latency
@@ -32,6 +32,7 @@ tests:
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws
   timeout: 7h0m0s
@@ -41,10 +42,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws
 - as: control-plane-24nodes-acs
@@ -53,14 +55,15 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-stackrox
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: perfscale.rox.systems
-      COMPUTE_NODE_REPLICAS: "24"
       ES_SECRETS_PATH: /secret_stackrox
       EXTRA_FLAGS: --churn-duration=20m --timeout=5h --metrics-profile metrics-aggregated.yml,https://raw.githubusercontent.com/stackrox/stackrox/refs/heads/master/tests/performance/scale/config/metrics-acs.yml
       USER_TAGS: |
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws-acs
   timeout: 5h0m0s
@@ -69,10 +72,11 @@ tests:
   steps:
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws-etcd-encryption
   timeout: 5h0m0s
@@ -82,12 +86,13 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
       ITERATION_MULTIPLIER_ENV: "15"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws
   timeout: 3h30m0s
@@ -111,10 +116,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-router-perf
     workflow: openshift-qe-installer-aws
   timeout: 5h0m0s
@@ -124,10 +130,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-heavy
     workflow: openshift-qe-installer-aws
   timeout: 5h0m0s
@@ -137,12 +144,13 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       EXTRA_FLAGS: --pod-ready-threshold=43s
       ITERATIONS_PER_NAMESPACE: "100"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-heavy
     workflow: openshift-qe-installer-aws
   timeout: 2h0m0s
@@ -152,11 +160,12 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       POD_READY_THRESHOLD: 4s
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-cni
     workflow: openshift-qe-installer-aws
   timeout: 2h0m0s
@@ -166,14 +175,15 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "6"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "9"
       COMPUTE_NODE_TYPE: m5.2xlarge
       LOKI_USE_SERVICEMONITOR: "false"
       OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: c5.4xlarge
       SET_ENV_BY_PLATFORM: custom
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - ref: openshift-qe-perfscale-aws-data-path-sg
     - chain: openshift-qe-data-path-tests
     workflow: openshift-qe-installer-aws
@@ -232,10 +242,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density
     workflow: openshift-qe-installer-aws-ovn-fips
   timeout: 5h0m0s
@@ -245,9 +256,9 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "6"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
       CILIUM_VERSION: 1.15.1
-      COMPUTE_NODE_REPLICAS: "9"
       COMPUTE_NODE_TYPE: m5.2xlarge
       HUBBLE: "true"
       LOKI_USE_SERVICEMONITOR: "false"
@@ -257,6 +268,7 @@ tests:
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - ref: openshift-qe-perfscale-aws-data-path-sg
     - chain: openshift-qe-data-path-tests
     workflow: openshift-qe-installer-aws-cilium
@@ -267,16 +279,17 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
       CILIUM_VERSION: 1.15.1
-      COMPUTE_NODE_REPLICAS: "24"
       COMPUTE_NODE_TYPE: m5.xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m5.xlarge
       HUBBLE: "true"
       USER_TAGS: |
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws-cilium
   timeout: 6h0m0s
@@ -286,16 +299,17 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "117"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
       CILIUM_VERSION: 1.15.1
-      COMPUTE_NODE_REPLICAS: "120"
       COMPUTE_NODE_TYPE: m5.xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m5.4xlarge
       HUBBLE: "true"
       USER_TAGS: |
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws-cilium
   timeout: 7h0m0s

ci-operator/config/openshift-qe/ocp-qe-perfscale-ci/openshift-qe-ocp-qe-perfscale-ci-main__aws-4.17-nightly-x86.yaml

@@ -21,8 +21,8 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       ENABLE_LOCAL_INDEX: "true"
       ES_TYPE: qe
       EXTRA_FLAGS: --churn-duration=20m --pod-ready-threshold=13s
@@ -33,6 +33,7 @@ tests:
       VERSION: "4.17"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     - chain: openshift-qe-orion-consolidated
     workflow: openshift-qe-installer-aws
@@ -43,8 +44,8 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "117"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "120"
       COMPUTE_NODE_TYPE: m5.xlarge
       EXTRA_FLAGS: --churn-duration=20m --service-latency
       PROFILE_TYPE: reporting
@@ -53,6 +54,7 @@ tests:
         TicketId 382
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws
   timeout: 7h0m0s
@@ -62,21 +64,23 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws
 - as: control-plane-etcdencrypt-24nodes
   cron: 0 19 2,16 * *
   steps:
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-control-plane
     workflow: openshift-qe-installer-aws-etcd-encryption
   timeout: 5h0m0s
@@ -100,10 +104,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-router-perf
     workflow: openshift-qe-installer-aws
   timeout: 5h0m0s
@@ -113,10 +118,11 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "24"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-heavy
     workflow: openshift-qe-installer-aws
   timeout: 5h0m0s
@@ -126,11 +132,10 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "21"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "3"
-      WORKER_REPLICA_COUNT: "24"
     test:
-    - ref: workers-scale
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-heavy
     workflow: openshift-qe-installer-aws-ovn-ipsec
   timeout: 5h0m0s
@@ -140,12 +145,13 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       EXTRA_FLAGS: --pod-ready-threshold=43s
       ITERATIONS_PER_NAMESPACE: "100"
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-heavy
     workflow: openshift-qe-installer-aws
   timeout: 2h0m0s
@@ -155,11 +161,12 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale-qe
     env:
+      ADDITIONAL_WORKER_NODES: "3"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "6"
       POD_READY_THRESHOLD: 4s
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - chain: openshift-qe-node-density-cni
     workflow: openshift-qe-installer-aws
   timeout: 2h0m0s
@@ -169,14 +176,15 @@ tests:
     allow_skip_on_success: true
     cluster_profile: aws-perfscale
     env:
+      ADDITIONAL_WORKER_NODES: "6"
       BASE_DOMAIN: perfscale.devcluster.openshift.com
-      COMPUTE_NODE_REPLICAS: "9"
       COMPUTE_NODE_TYPE: m5.2xlarge
       LOKI_USE_SERVICEMONITOR: "false"
       OPENSHIFT_INFRA_NODE_INSTANCE_TYPE: c5.4xlarge
       SET_ENV_BY_PLATFORM: custom
       ZONES_COUNT: "3"
     test:
+    - ref: openshift-qe-workers-scale
     - ref: openshift-qe-perfscale-aws-data-path-sg
     - chain: openshift-qe-data-path-tests
     workflow: openshift-qe-installer-aws