NO-JIRA: HCP AutoNode e2e test changes

ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

@@ -371,45 +371,19 @@ tests:
       resource_type: openstack-vh-mecha-central-quota-slice
     workflow: hypershift-openstack-aws-conformance
 - always_run: false
-  as: e2e-aws-karpenter-core
+  as: e2e-aws-autonode
   optional: true
   steps:
     cluster_profile: hypershift
+    dependencies:
+      OCP_IMAGE_N1: release:n1minor
+      OCP_IMAGE_N2: release:n2minor
     env:
-      HYPERSHIFT_AUTONODE: "true"
-      HYPERSHIFT_NODE_COUNT: "1"
+      CI_TESTS_RUN: ^TestKarpenter$
+      ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      REQUEST_SERVING_COMPONENT_TEST: "true"
       TECH_PREVIEW_NO_UPGRADE: "true"
-    test:
-    - as: e2e-aws-karpenter-core
-      cli: latest
-      commands: |-
-        export CLUSTER="$(<"${SHARED_DIR}/cluster-name")"
-        export HYPERSHIFT_NAMESPACE="$(<"${SHARED_DIR}/management_cluster_namespace")"
-
-        mkdir -p /tmp/karpenter
-        YQ="/tmp/karpenter/yq"
-        curl -L -o ${YQ} https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
-        chmod +x ${YQ}
-        export PATH="/tmp/karpenter:$PATH"
-
-        dir=$(mktemp -d)
-        git clone https://github.com/openshift/kubernetes-sigs-karpenter.git --depth=1 $dir
-        go -C $dir mod vendor
-
-        export KUBECONFIG=${SHARED_DIR}/management_cluster_kubeconfig
-        oc annotate -n ${HYPERSHIFT_NAMESPACE}-${CLUSTER} hcp/${CLUSTER} hypershift.openshift.io/karpenter-core-e2e-override=true
-
-        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
-        # delete the binding to allow ec2nodeclass to be deleted; the karpenter-core-e2e-override annotation allows the binding to be deleted
-        oc delete validatingadmissionpolicybindings.admissionregistration.k8s.io karpenter-binding.ec2nodeclass.hypershift.io
-        KARPENTER_CORE_DIR=$dir make karpenter-upstream-e2e
-      from: src
-      resources:
-        requests:
-          cpu: 100m
-          memory: 200Mi
-      timeout: 2h0m0s
-    workflow: hypershift-aws-e2e-cluster
+    workflow: hypershift-aws-e2e-external
 - as: verify-deps
   steps:
     env:

ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml

@@ -227,16 +227,16 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws-karpenter-core
+    context: ci/prow/e2e-aws-autonode
     decorate: true
     labels:
       ci-operator.openshift.io/cloud: hypershift
       ci-operator.openshift.io/cloud-cluster-profile: hypershift
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-hypershift-main-e2e-aws-karpenter-core
+    name: pull-ci-openshift-hypershift-main-e2e-aws-autonode
     optional: true
-    rerun_command: /test e2e-aws-karpenter-core
+    rerun_command: /test e2e-aws-autonode
     spec:
       containers:
       - args:
@@ -245,7 +245,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-karpenter-core
+        - --target=e2e-aws-autonode
         command:
         - ci-operator
         image: ci-operator:latest
@@ -293,7 +293,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-karpenter-core,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-autonode,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: