From 8c541f37ef3617060d74b9cb5e8f152502862a34 Mon Sep 17 00:00:00 2001
From: Joel Smith <joelsmith@redhat.com>
Date: Thu, 16 Jul 2026 15:06:52 -0600
Subject: [PATCH] Fix Cluster Autoscaler tests in Cluster API Actuator repo

Strangely, the existing e2e-aws-autoscaler was actually a periodic pre.

- Rename old e2e-aws-autoscaler to e2e-aws-autoscaler-periodic-pre
- Add new e2e-aws-autoscaler-periodic to run non-periodics
---
 ...shift-cluster-api-actuator-pkg-master.yaml | 17 +++-
 ...er-api-actuator-pkg-master-presubmits.yaml | 86 +++++++++++++++++++
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml
index 1bd45d029de82..44d3de5fe4e3d 100644
--- a/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml
+++ b/ci-operator/config/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master.yaml
@@ -352,7 +352,7 @@ tests:
       timeout: 3h0m0s
     workflow: openshift-e2e-openstack-ipi
 - always_run: false
-  as: e2e-aws-autoscaler
+  as: e2e-aws-autoscaler-periodic-pre
   optional: true
   steps:
     cluster_profile: openshift-org-aws
@@ -366,6 +366,21 @@ tests:
           cpu: 100m
       timeout: 3h0m0s
     workflow: ipi-aws
+- as: e2e-aws-autoscaler
+  optional: true
+  run_if_changed: ^(pkg/operators/cluster-autoscaler-operator\.go|pkg/autoscaler/.*)$
+  steps:
+    cluster_profile: openshift-org-aws
+    test:
+    - as: test
+      cli: latest
+      commands: JUNIT_DIR=${ARTIFACT_DIR} make test-e2e-autoscaler
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+      timeout: 3h0m0s
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master-presubmits.yaml
index d0ab483c0dfd0..69e642642d16c 100644
--- a/ci-operator/jobs/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cluster-api-actuator-pkg/openshift-cluster-api-actuator-pkg-master-presubmits.yaml
@@ -20,6 +20,7 @@ presubmits:
     name: pull-ci-openshift-cluster-api-actuator-pkg-master-e2e-aws-autoscaler
     optional: true
     rerun_command: /test e2e-aws-autoscaler
+    run_if_changed: ^(pkg/operators/cluster-autoscaler-operator\.go|pkg/autoscaler/.*)$
     spec:
       containers:
       - args:
@@ -85,6 +86,91 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-autoscaler,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build03
+    context: ci/prow/e2e-aws-autoscaler-periodic-pre
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile.ci
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-api-actuator-pkg-master-e2e-aws-autoscaler-periodic-pre
+    optional: true
+    rerun_command: /test e2e-aws-autoscaler-periodic-pre
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=e2e-aws-autoscaler-periodic-pre
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws-autoscaler-periodic-pre,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: