MULTIARCH-4769 Day 0 multiarch compute arm x86

ci-operator/config/openshift/installer/openshift-installer-master.yaml

@@ -209,6 +209,12 @@ releases:
       include_built_images: true
       name: "4.17"
       namespace: ocp
+  multi-latest:
+    candidate:
+      architecture: multi
+      product: ocp
+      stream: nightly
+      version: "4.17"
 resources:
   '*':
     requests:
@@ -869,6 +875,20 @@ tests:
       PLATFORM_EXTERNAL_CCM_ENABLED: "yes"
     workflow: openshift-e2e-external-aws
   timeout: 6h0m0s
+- always_run: false
+  as: e2e-aws-ovn-heterogeneous
+  optional: true
+  steps:
+    cluster_profile: aws
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
+    env:
+      COMPUTE_ARCH: amd64
+      CONTROL_ARCH: arm64
+      FEATURE_GATES: '["MultiArchInstallAWS=true"]'
+      FEATURE_SET: CustomNoUpgrade
+    workflow: openshift-e2e-aws-heterogeneous-day-0
+  timeout: 6h0m0s
 zz_generated_metadata:
   branch: master
   org: openshift

ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.17.yaml

@@ -211,6 +211,28 @@ tests:
         pod should start\| pod sysctls\| build volumes should mount given secrets
         and configmaps into the build pod
     workflow: openshift-e2e-aws-heterogeneous
+- as: ocp-e2e-aws-ovn-heterogeneous-day-0
+  cron: 08 11 * * 5
+  steps:
+    cluster_profile: aws-2
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+      COMPUTE_ARCH: amd64
+      CONTROL_ARCH: arm64
+      TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\|
+        FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image
+        builds should succeed\| build can reference a cluster service\| custom build
+        with buildah\| oc new-app should succeed\| prune builds based on settings\|
+        s2i build with a root\| verify /run filesystem contents\| oc can run\| oc
+        debug\| oc idle\| Pods cannot access\| Image append should create\| Image
+        extract should extract\| Image info should display\| Image layer subresource\|
+        oc tag should change image\| when installed on the cluster should\| OpenShift
+        alerting rules\| The HAProxy router should\| egressrouter cni resources\|
+        pod should start\| pod sysctls\| build volumes should mount given secrets
+        and configmaps into the build pod
+    workflow: openshift-e2e-aws-heterogeneous-day-0
 - as: ocp-e2e-serial-aws-ovn-heterogeneous
   cron: 19 23 * * 2
   steps:

ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml

@@ -3907,6 +3907,88 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-ovn-fips,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build03
+    context: ci/prow/e2e-aws-ovn-heterogeneous
+    decorate: true
+    decoration_config:
+      timeout: 6h0m0s
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-installer-master-e2e-aws-ovn-heterogeneous
+    optional: true
+    rerun_command: /test e2e-aws-ovn-heterogeneous
+    skip_if_only_changed: (^(docs|upi|hack)/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^images/(agent|alibabacloud|azure|azurestack|baremetal|gcp|ibmcloud|libvirt|nutanix|openstack|ovirt|powervs|vsphere)/)
+    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
+        - --secret-dir=/usr/local/e2e-aws-ovn-heterogeneous-cluster-profile
+        - --target=e2e-aws-ovn-heterogeneous
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-aws-ovn-heterogeneous-cluster-profile
+          name: cluster-profile
+        - 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: cluster-profile
+        secret:
+          secretName: cluster-secrets-aws
+      - 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-ovn-heterogeneous,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:

ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml

@@ -23835,6 +23835,87 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build05
+  cron: 08 11 * * 5
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: master
+    org: openshift
+    repo: multiarch
+  labels:
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-2
+    ci-operator.openshift.io/variant: nightly-4.17
+    ci.openshift.io/generator: prowgen
+    job-release: "4.17"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-aws-ovn-heterogeneous-day-0
+  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
+      - --secret-dir=/usr/local/ocp-e2e-aws-ovn-heterogeneous-day-0-cluster-profile
+      - --target=ocp-e2e-aws-ovn-heterogeneous-day-0
+      - --variant=nightly-4.17
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /etc/boskos
+        name: boskos
+        readOnly: true
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /usr/local/ocp-e2e-aws-ovn-heterogeneous-day-0-cluster-profile
+        name: cluster-profile
+      - 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: cluster-profile
+      secret:
+        secretName: cluster-secrets-aws-2
+    - 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
 - agent: kubernetes
   cluster: build05
   decorate: true

ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh

@@ -63,10 +63,6 @@ function eval_instance_capacity() {
   set -o errexit
 }
 
-
-# BootstrapInstanceType gets its value from pkg/types/aws/defaults/platform.go
-architecture=${OCP_ARCH:-"amd64"}
-
 CONTROL_PLANE_INSTANCE_SIZE="xlarge"
 if [[ "${SIZE_VARIANT}" == "xlarge" ]]; then
   CONTROL_PLANE_INSTANCE_SIZE="8xlarge"
@@ -91,7 +87,9 @@ if [[ "${CLUSTER_TYPE}" =~ ^aws-s?c2s$ ]]; then
   fi
 elif [[ "${CLUSTER_TYPE}" == "aws-arm64" ]] || [[ "${OCP_ARCH}" == "arm64" ]]; then
   # ARM 64
-  architecture="arm64"
+  CONTROL_ARCH="arm64"
+  COMPUTE_ARCH="arm64"
+
   if [[ "${COMPUTE_NODE_TYPE}" == "" ]]; then
     COMPUTE_NODE_TYPE="m6g.xlarge"
   fi
@@ -100,7 +98,7 @@ elif [[ "${CLUSTER_TYPE}" == "aws-arm64" ]] || [[ "${OCP_ARCH}" == "arm64" ]]; t
     CONTROL_PLANE_INSTANCE_TYPE="m6g.${CONTROL_PLANE_INSTANCE_SIZE}"
   fi
 else
-  # AMD 64
+  # AMD 64 or Multiarch Compute
 
   # m6a (AMD) are more cost effective than other x86 instance types
   # for general purpose work. Use by default, when supported in the
@@ -113,20 +111,34 @@ else
   # Do not change auto-types unless it is coordinated with the cloud
   # financial operations team. Savings plans may be in place to
   # decrease the cost of certain instance families.
-  if [[ "${CONTROL_PLANE_INSTANCE_TYPE}" == "" ]]; then
-    if [[ "${IS_M6A_REGION}" == "yes" ]]; then
-      CONTROL_PLANE_INSTANCE_TYPE=$(eval_instance_capacity "m6a.${CONTROL_PLANE_INSTANCE_SIZE}" "m6i.${CONTROL_PLANE_INSTANCE_SIZE}")
-    else
-      CONTROL_PLANE_INSTANCE_TYPE="m6i.${CONTROL_PLANE_INSTANCE_SIZE}"
+  if [[ "${CONTROL_ARCH}" == "amd64" ]]; then
+    if [[ "${CONTROL_PLANE_INSTANCE_TYPE}" == "" ]]; then
+      if [[ "${IS_M6A_REGION}" == "yes" ]]; then
+        CONTROL_PLANE_INSTANCE_TYPE=$(eval_instance_capacity "m6a.${CONTROL_PLANE_INSTANCE_SIZE}" "m6i.${CONTROL_PLANE_INSTANCE_SIZE}")
+      else
+        CONTROL_PLANE_INSTANCE_TYPE="m6i.${CONTROL_PLANE_INSTANCE_SIZE}"
+      fi
     fi
+  elif [[ "${CONTROL_ARCH}" == "arm64" ]]; then
+    CONTROL_PLANE_INSTANCE_TYPE="m6g.${CONTROL_PLANE_INSTANCE_SIZE}"
+  else
+    echo "${CONTROL_ARCH} is not a valid control plane architecture..."
+    exit 1
   fi
 
-  if [[ "${COMPUTE_NODE_TYPE}" == "" ]]; then
-    if [[ "${IS_M6A_REGION}" == "yes" ]]; then
-      COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
-    else
-      COMPUTE_NODE_TYPE="m6i.xlarge"
+  if [[ "${COMPUTE_ARCH}" == "amd64" ]]; then
+    if [[ "${COMPUTE_NODE_TYPE}" == "" ]]; then
+      if [[ "${IS_M6A_REGION}" == "yes" ]]; then
+        COMPUTE_NODE_TYPE=$(eval_instance_capacity "m6a.xlarge" "m6i.xlarge")
+      else
+        COMPUTE_NODE_TYPE="m6i.xlarge"
+      fi
     fi
+  elif [[ "${COMPUTE_ARCH}" == "arm64" ]]; then
+    COMPUTE_NODE_TYPE="m6g.xlarge"
+  else
+    echo "${COMPUTE_ARCH} is not a valid compute plane architecture..."
+    exit 1
   fi
 
 fi
@@ -208,14 +220,14 @@ platform:
     userTags:
       expirationDate: ${expiration_date}
 controlPlane:
-  architecture: ${architecture}
+  architecture: ${CONTROL_ARCH}
   name: master
   replicas: ${master_replicas}
   platform:
     aws:
       type: ${CONTROL_PLANE_INSTANCE_TYPE}
 compute:
-- architecture: ${architecture}
+- architecture: ${COMPUTE_ARCH}
   name: worker
   replicas: ${worker_replicas}
   platform:
@@ -339,7 +351,7 @@ if [[ -n "${AWS_EDGE_POOL_ENABLED-}" ]]; then
   patch_edge="${SHARED_DIR}/install-config-edge.yaml.patch"
   cat > "${patch_edge}" << EOF
 compute:
-- architecture: ${architecture}
+- architecture: ${COMPUTE_ARCH}
   name: edge
   platform:
     aws:

ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml

@@ -80,6 +80,14 @@ ref:
       * "" (default) - corresponds to "Optional" behaviour. 
       * "Required" - sets IMDSv2 to Required for all machines in install-config, metadata service is not accessible without auth procedure.
       * "Optional" - auth procedure on metadata service is optional
+  - name: COMPUTE_ARCH
+    default: "amd64"
+    documentation: |-
+      Compute node architecture specification.  Used for multiarch compute clusters.
+  - name: CONTROL_ARCH
+    default: "amd64"
+    documentation: |-
+      Control plane node architecture specification.  Used for multiarch compute clusters.
   - name: PRESERVE_BOOTSTRAP_IGNITION
     default: ""
     documentation: |-

ci-operator/step-registry/openshift/e2e/aws/heterogeneous/day-0/OWNERS

@@ -0,0 +1,5 @@
+approvers:
+- deepsm007
+- multiarch-approvers
+reviewers:
+- multiarch-reviewers

ci-operator/step-registry/openshift/e2e/aws/heterogeneous/day-0/openshift-e2e-aws-heterogeneous-day-0-workflow.metadata.json

@@ -0,0 +1,12 @@
+{
+	"path": "openshift/e2e/aws/heterogeneous/day-0/openshift-e2e-aws-heterogeneous-day-0-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"deepsm007",
+			"multiarch-approvers"
+		],
+		"reviewers": [
+			"multiarch-reviewers"
+		]
+	}
+}