diff --git a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-main__e2e.yaml b/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-main__e2e.yaml index affbda2ad26f7..ddf6bdb0ddff6 100644 --- a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-main__e2e.yaml +++ b/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-main__e2e.yaml @@ -38,10 +38,17 @@ tests: Details: <{{.Status.URL}}|View logs> · steps: env: + ADAPTER_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-adapter + ADAPTER_IMAGE_TAG: latest + API_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-api + API_IMAGE_TAG: latest CLUSTER_NAME: hyperfleet-dev-prow + IMAGE_REGISTRY: quay.io LABEL_FILTER: tier0 NAMESPACE_PREFIX: e2e REGION: us-central1-a + SENTINEL_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-sentinel + SENTINEL_IMAGE_TAG: latest workflow: openshift-hyperfleet-e2e - as: tier1-nightly cron: 30 11 * * * @@ -57,19 +64,33 @@ tests: Details: <{{.Status.URL}}|View logs> · steps: env: + ADAPTER_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-adapter + ADAPTER_IMAGE_TAG: latest + API_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-api + API_IMAGE_TAG: latest CLUSTER_NAME: hyperfleet-dev-prow + IMAGE_REGISTRY: quay.io LABEL_FILTER: tier1 NAMESPACE_PREFIX: e2e REGION: us-central1-a + SENTINEL_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-sentinel + SENTINEL_IMAGE_TAG: latest workflow: openshift-hyperfleet-e2e - as: tier2-nightly cron: 30 13 * * * steps: env: + ADAPTER_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-adapter + ADAPTER_IMAGE_TAG: latest + API_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-api + API_IMAGE_TAG: latest CLUSTER_NAME: hyperfleet-dev-prow + IMAGE_REGISTRY: quay.io LABEL_FILTER: tier2 NAMESPACE_PREFIX: e2e REGION: us-central1-a + SENTINEL_IMAGE_REPO: redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-sentinel + SENTINEL_IMAGE_TAG: latest workflow: openshift-hyperfleet-e2e zz_generated_metadata: branch: main diff --git a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__e2e.yaml b/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__e2e.yaml deleted file mode 100644 index 340986516f7a6..0000000000000 --- a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__e2e.yaml +++ /dev/null @@ -1,81 +0,0 @@ -base_images: - ci_hyperfleet-credential-provider_latest: - name: hyperfleet-credential-provider - namespace: ci - tag: latest -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.25-openshift-4.22 -images: - items: - - dockerfile_path: Dockerfile - inputs: - ci_hyperfleet-credential-provider_latest: - as: - - registry.ci.openshift.org/ci/hyperfleet-credential-provider:latest - to: hyperfleet-e2e -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: tier0-candidate - cron: 0 8 * * * - reporter_config: - channel: '#hyperfleet-e2e-status' - job_states_to_report: - - success - - failure - - error - report_template: |- - {{if eq .Status.State "success"}}:white_check_mark:{{else}}:x:{{end}} *{{.Spec.Job}}* ended with *{{.Status.State}}*. - Build: #{{.Status.BuildID}} - Details: <{{.Status.URL}}|View logs> · - steps: - env: - ADAPTER_CHART_REF: release-0.2 - ADAPTER_IMAGE_TAG: release-0.2 - API_CHART_REF: release-0.2 - API_IMAGE_TAG: release-0.2 - CLUSTER_NAME: hyperfleet-dev-prow - LABEL_FILTER: tier0 - NAMESPACE_PREFIX: release - REGION: us-central1-a - SENTINEL_CHART_REF: release-0.2 - SENTINEL_IMAGE_TAG: release-0.2 - workflow: openshift-hyperfleet-e2e -- as: tier1-candidate - cron: 30 8 * * * - reporter_config: - channel: '#hyperfleet-e2e-status' - job_states_to_report: - - success - - failure - - error - report_template: |- - {{if eq .Status.State "success"}}:white_check_mark:{{else}}:x:{{end}} *{{.Spec.Job}}* ended with *{{.Status.State}}*. - Build: #{{.Status.BuildID}} - Details: <{{.Status.URL}}|View logs> · - steps: - env: - ADAPTER_CHART_REF: release-0.2 - ADAPTER_IMAGE_TAG: release-0.2 - API_CHART_REF: release-0.2 - API_IMAGE_TAG: release-0.2 - CLUSTER_NAME: hyperfleet-dev-prow - LABEL_FILTER: tier1 - NAMESPACE_PREFIX: release - REGION: us-central1-a - SENTINEL_CHART_REF: release-0.2 - SENTINEL_IMAGE_TAG: release-0.2 - workflow: openshift-hyperfleet-e2e -zz_generated_metadata: - branch: release-0.2 - org: openshift-hyperfleet - repo: hyperfleet-e2e - variant: e2e diff --git a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__images.yaml b/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__images.yaml deleted file mode 100644 index 1a0f1c0218691..0000000000000 --- a/ci-operator/config/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2__images.yaml +++ /dev/null @@ -1,39 +0,0 @@ -base_images: - ci_hyperfleet-credential-provider_latest: - name: hyperfleet-credential-provider - namespace: ci - tag: latest -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-9-golang-1.25-openshift-4.22 -images: - items: - - build_args: - - name: APP_VERSION - value: v0.2.0 - - name: BUILD_DATE - value: "2026-03-30T08:13:20Z" - - name: GIT_SHA - value: c73f998 - dockerfile_path: Dockerfile - inputs: - ci_hyperfleet-credential-provider_latest: - as: - - registry.ci.openshift.org/ci/hyperfleet-credential-provider:latest - to: hyperfleet-e2e -promotion: - to: - - namespace: ci - tag: release-0.2 -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: release-0.2 - org: openshift-hyperfleet - repo: hyperfleet-e2e - variant: images diff --git a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-periodics.yaml b/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-periodics.yaml deleted file mode 100644 index 29dece6aaf96b..0000000000000 --- a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-periodics.yaml +++ /dev/null @@ -1,175 +0,0 @@ -periodics: -- agent: kubernetes - cluster: build08 - cron: 0 8 * * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - extra_refs: - - base_ref: release-0.2 - org: openshift-hyperfleet - repo: hyperfleet-e2e - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/variant: e2e - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hyperfleet-hyperfleet-e2e-release-0.2-e2e-tier0-candidate - reporter_config: - slack: - channel: '#hyperfleet-e2e-status' - job_states_to_report: - - success - - failure - - error - report_template: |- - {{if eq .Status.State "success"}}:white_check_mark:{{else}}:x:{{end}} *{{.Spec.Job}}* ended with *{{.Status.State}}*. - Build: #{{.Status.BuildID}} - Details: <{{.Status.URL}}|View logs> · - 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=tier0-candidate - - --variant=e2e - 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 - cluster: build08 - cron: 30 8 * * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - extra_refs: - - base_ref: release-0.2 - org: openshift-hyperfleet - repo: hyperfleet-e2e - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/variant: e2e - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hyperfleet-hyperfleet-e2e-release-0.2-e2e-tier1-candidate - reporter_config: - slack: - channel: '#hyperfleet-e2e-status' - job_states_to_report: - - success - - failure - - error - report_template: |- - {{if eq .Status.State "success"}}:white_check_mark:{{else}}:x:{{end}} *{{.Spec.Job}}* ended with *{{.Status.State}}*. - Build: #{{.Status.BuildID}} - Details: <{{.Status.URL}}|View logs> · - 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=tier1-candidate - - --variant=e2e - 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 diff --git a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-postsubmits.yaml b/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-postsubmits.yaml deleted file mode 100644 index 10662e31e28ee..0000000000000 --- a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-postsubmits.yaml +++ /dev/null @@ -1,65 +0,0 @@ -postsubmits: - openshift-hyperfleet/hyperfleet-e2e: - - agent: kubernetes - always_run: true - branches: - - ^release-0\.2$ - cluster: build09 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: images - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-hyperfleet-hyperfleet-e2e-release-0.2-images-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=images - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-presubmits.yaml b/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-presubmits.yaml deleted file mode 100644 index ff49528c28015..0000000000000 --- a/ci-operator/jobs/openshift-hyperfleet/hyperfleet-e2e/openshift-hyperfleet-hyperfleet-e2e-release-0.2-presubmits.yaml +++ /dev/null @@ -1,118 +0,0 @@ -presubmits: - openshift-hyperfleet/hyperfleet-e2e: - - agent: kubernetes - always_run: true - branches: - - ^release-0\.2$ - - ^release-0\.2- - cluster: build03 - context: ci/prow/e2e-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/variant: e2e - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hyperfleet-hyperfleet-e2e-release-0.2-e2e-images - rerun_command: /test e2e-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=e2e - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-0\.2$ - - ^release-0\.2- - cluster: build03 - context: ci/prow/images-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/variant: images - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hyperfleet-hyperfleet-e2e-release-0.2-images-images - rerun_command: /test images-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=images - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )images-images,?($|\s.*) diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-ref.yaml b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-ref.yaml index da7342fb7fc94..4b18c6fbcd548 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-ref.yaml +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-ref.yaml @@ -52,22 +52,22 @@ ref: default: "10" documentation: Seconds to wait between API accessibility retry attempts. - name: IMAGE_REGISTRY - default: "registry.ci.openshift.org" + default: "quay.io" documentation: The container image registry to pull images from. - name: API_IMAGE_REPO - default: "ci/hyperfleet-api" + default: "redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-api" documentation: The image repository path for the API component. - name: API_IMAGE_TAG default: "latest" documentation: The image tag for the API component. - name: ADAPTER_IMAGE_REPO - default: "ci/hyperfleet-adapter" + default: "redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-adapter" documentation: The image repository path for the Adapter component. - name: ADAPTER_IMAGE_TAG default: "latest" documentation: The image tag for the Adapter component. - name: SENTINEL_IMAGE_REPO - default: "ci/hyperfleet-sentinel" + default: "redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-sentinel" documentation: The image repository path for the Sentinel component. - name: SENTINEL_IMAGE_TAG default: "latest" diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-ref.yaml b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-ref.yaml index ff29c0f86505b..d292f8f253661 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-ref.yaml +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-ref.yaml @@ -22,10 +22,10 @@ ref: default: "charts" documentation: The path to the charts directory within the Adapter chart repository. - name: IMAGE_REGISTRY - default: "registry.ci.openshift.org" + default: "quay.io" documentation: The container image registry to pull images from. - name: ADAPTER_IMAGE_REPO - default: "ci/hyperfleet-adapter" + default: "redhat-services-prod/hyperfleet-tenant/hyperfleet/hyperfleet-adapter" documentation: The image repository path for the Adapter component. - name: ADAPTER_IMAGE_TAG default: "latest"