diff --git a/ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml b/ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml index 9e41336a122ab..c8e87513d24cd 100644 --- a/ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml +++ b/ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml @@ -7,119 +7,45 @@ images: items: - additional_architectures: - arm64 - dockerfile_path: Dockerfile.gui - to: fleetshift-gui - - additional_architectures: - - arm64 - dockerfile_path: Dockerfile.mock-servers - to: fleetshift-mock-servers - - additional_architectures: - - arm64 - dockerfile_path: Dockerfile.mock-ui-plugins - to: fleetshift-mock-ui-plugins + dockerfile_path: Dockerfile.web + to: fleetshift-web resources: '*': requests: cpu: 100m memory: 200Mi tests: -- as: pr-image-mirror-gui - capabilities: - - arm64 - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-gui - env: - IMAGE_REPO: fleetshift-gui - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-latest-gui - capabilities: - - arm64 - postsubmit: true - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-gui - env: - IMAGE_REPO: fleetshift-gui - IMAGE_TAG: latest - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-image-mirror-mock-servers - capabilities: - - arm64 - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-servers - env: - IMAGE_REPO: fleetshift-mock-servers - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-latest-mock-servers +- as: pr-image-mirror capabilities: - arm64 - postsubmit: true steps: dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-servers + SOURCE_IMAGE_REF: fleetshift-web env: - IMAGE_REPO: fleetshift-mock-servers - IMAGE_TAG: latest + IMAGE_REPO: fleetshift-web REGISTRY_ORG: stolostron workflow: fleetshift-ci-image-mirror -- as: pr-image-mirror-mock-ui-plugins - capabilities: - - arm64 - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-ui-plugins - env: - IMAGE_REPO: fleetshift-mock-ui-plugins - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-latest-mock-ui-plugins +- as: pr-merge-image-mirror-latest capabilities: - arm64 postsubmit: true steps: dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-ui-plugins + SOURCE_IMAGE_REF: fleetshift-web env: - IMAGE_REPO: fleetshift-mock-ui-plugins + IMAGE_REPO: fleetshift-web IMAGE_TAG: latest REGISTRY_ORG: stolostron workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-sha-gui - capabilities: - - arm64 - postsubmit: true - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-gui - env: - IMAGE_REPO: fleetshift-gui - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-sha-mock-servers - capabilities: - - arm64 - postsubmit: true - steps: - dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-servers - env: - IMAGE_REPO: fleetshift-mock-servers - REGISTRY_ORG: stolostron - workflow: fleetshift-ci-image-mirror -- as: pr-merge-image-mirror-sha-mock-ui-plugins +- as: pr-merge-image-mirror-sha capabilities: - arm64 postsubmit: true steps: dependencies: - SOURCE_IMAGE_REF: fleetshift-mock-ui-plugins + SOURCE_IMAGE_REF: fleetshift-web env: - IMAGE_REPO: fleetshift-mock-ui-plugins + IMAGE_REPO: fleetshift-web REGISTRY_ORG: stolostron workflow: fleetshift-ci-image-mirror zz_generated_metadata: diff --git a/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-postsubmits.yaml b/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-postsubmits.yaml index e7aa39d703ef3..a82b0f2494bb3 100644 --- a/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-postsubmits.yaml +++ b/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-postsubmits.yaml @@ -12,7 +12,7 @@ postsubmits: capability/arm64: arm64 ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest-gui + name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest spec: containers: - args: @@ -20,7 +20,7 @@ postsubmits: - --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-gui + - --target=pr-merge-image-mirror-latest command: - ci-operator env: @@ -82,7 +82,7 @@ postsubmits: capability/arm64: arm64 ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest-mock-servers + name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-sha spec: containers: - args: @@ -90,287 +90,7 @@ postsubmits: - --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-mock-servers - 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: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-latest-mock-ui-plugins - 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-mock-ui-plugins - 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: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-sha-gui - 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-gui - 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: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-sha-mock-servers - 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-mock-servers - 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: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-fleetshift-fleetshift-user-interface-main-pr-merge-image-mirror-sha-mock-ui-plugins - 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-mock-ui-plugins + - --target=pr-merge-image-mirror-sha command: - ci-operator env: diff --git a/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-presubmits.yaml b/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-presubmits.yaml index 525670b686a2c..2d217252c800a 100644 --- a/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-presubmits.yaml +++ b/ci-operator/jobs/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main-presubmits.yaml @@ -62,7 +62,7 @@ presubmits: - ^main$ - ^main- cluster: build06 - context: ci/prow/pr-image-mirror-gui + context: ci/prow/pr-image-mirror decorate: true decoration_config: skip_cloning: true @@ -70,8 +70,8 @@ presubmits: capability/arm64: arm64 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-fleetshift-fleetshift-user-interface-main-pr-image-mirror-gui - rerun_command: /test pr-image-mirror-gui + name: pull-ci-fleetshift-fleetshift-user-interface-main-pr-image-mirror + rerun_command: /test pr-image-mirror spec: containers: - args: @@ -79,7 +79,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - - --target=pr-image-mirror-gui + - --target=pr-image-mirror command: - ci-operator env: @@ -129,152 +129,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )pr-image-mirror-gui,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build06 - context: ci/prow/pr-image-mirror-mock-servers - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-fleetshift-fleetshift-user-interface-main-pr-image-mirror-mock-servers - rerun_command: /test pr-image-mirror-mock-servers - 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-image-mirror-mock-servers - 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 - trigger: (?m)^/test( | .* )pr-image-mirror-mock-servers,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build06 - context: ci/prow/pr-image-mirror-mock-ui-plugins - decorate: true - decoration_config: - skip_cloning: true - labels: - capability/arm64: arm64 - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-fleetshift-fleetshift-user-interface-main-pr-image-mirror-mock-ui-plugins - rerun_command: /test pr-image-mirror-mock-ui-plugins - 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-image-mirror-mock-ui-plugins - 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 - trigger: (?m)^/test( | .* )pr-image-mirror-mock-ui-plugins,?($|\s.*) + trigger: (?m)^/test( | .* )pr-image-mirror,?($|\s.*)