fleetshift-ui repo: split up x86 and multiarch image builds to prioritize x86 builds and improve failure rate

ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml

@@ -5,9 +5,7 @@ build_root:
     tag: nodejs20-linux
 images:
   items:
-  - additional_architectures:
-    - arm64
-    dockerfile_path: Dockerfile.web
+  - dockerfile_path: Dockerfile.web
     to: fleetshift-web
 resources:
   '*':
@@ -16,8 +14,6 @@ resources:
       memory: 200Mi
 tests:
 - as: pr-image-mirror
-  capabilities:
-  - arm64
   steps:
     dependencies:
       SOURCE_IMAGE_REF: fleetshift-web
@@ -26,8 +22,6 @@ tests:
       REGISTRY_ORG: stolostron
     workflow: fleetshift-ci-image-mirror
 - as: pr-merge-image-mirror-latest
-  capabilities:
-  - arm64
   postsubmit: true
   steps:
     dependencies:
@@ -38,8 +32,6 @@ tests:
       REGISTRY_ORG: stolostron
     workflow: fleetshift-ci-image-mirror
 - as: pr-merge-image-mirror-sha
-  capabilities:
-  - arm64
   postsubmit: true
   steps:
     dependencies:

ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main__multiarch.yaml

@@ -0,0 +1,55 @@
+build_root:
+  image_stream_tag:
+    name: builder
+    namespace: stolostron
+    tag: nodejs20-linux
+images:
+  items:
+  - additional_architectures:
+    - arm64
+    dockerfile_path: Dockerfile.web
+    to: fleetshift-web
+resources:
+  '*':
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tests:
+- as: pr-image-mirror
+  capabilities:
+  - arm64
+  steps:
+    dependencies:
+      SOURCE_IMAGE_REF: fleetshift-web
+    env:
+      IMAGE_REPO: fleetshift-web
+      REGISTRY_ORG: stolostron
+    workflow: fleetshift-ci-image-mirror
+- as: pr-merge-image-mirror-latest
+  capabilities:
+  - arm64
+  postsubmit: true
+  steps:
+    dependencies:
+      SOURCE_IMAGE_REF: fleetshift-web
+    env:
+      IMAGE_REPO: fleetshift-web
+      IMAGE_TAG: latest
+      REGISTRY_ORG: stolostron
+    workflow: fleetshift-ci-image-mirror
+- as: pr-merge-image-mirror-sha
+  capabilities:
+  - arm64
+  postsubmit: true
+  steps:
+    dependencies:
+      SOURCE_IMAGE_REF: fleetshift-web
+    env:
+      IMAGE_REPO: fleetshift-web
+      REGISTRY_ORG: stolostron
+    workflow: fleetshift-ci-image-mirror
+zz_generated_metadata:
+  branch: main
+  org: fleetshift
+  repo: fleetshift-user-interface
+  variant: multiarch

ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-postsubmits.yaml

@@ -11,9 +11,10 @@ postsubmits:
       - Dockerfile.web
     labels:
       capability/arm64: arm64
+      ci-operator.openshift.io/variant: multiarch
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest
+    name: branch-ci-fleetshift-fleetshift-user-interface-main-multiarch-pr-merge-image-mirror-latest
     spec:
       containers:
       - args:
@@ -22,6 +23,7 @@ postsubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --target=pr-merge-image-mirror-latest
+        - --variant=multiarch
         command:
         - ci-operator
         env:
@@ -82,6 +84,148 @@ postsubmits:
       - Dockerfile.web
     labels:
       capability/arm64: arm64
+      ci-operator.openshift.io/variant: multiarch
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-fleetshift-fleetshift-user-interface-main-multiarch-pr-merge-image-mirror-sha
+    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
+        - --target=pr-merge-image-mirror-sha
+        - --variant=multiarch
+        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/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: 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
+    always_run: true
+    branches:
+    - ^main$
+    cluster: build07
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - Dockerfile.web
+    labels:
+      ci.openshift.io/generator: prowgen
+    max_concurrency: 1
+    name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest
+    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
+        - --target=pr-merge-image-mirror-latest
+        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/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: 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
+    always_run: true
+    branches:
+    - ^main$
+    cluster: build07
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - Dockerfile.web
+    labels:
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
     name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-sha