From b684072928ca8bdb0ecfe18dfd99556b6bfb8a68 Mon Sep 17 00:00:00 2001 From: Shivprakash Muley Date: Fri, 15 May 2026 15:51:52 +0530 Subject: [PATCH 1/3] MG-272: Added Hypershift weekly job for support-log-gather operator --- ...ift-must-gather-operator-release-4.22.yaml | 62 ++++++++++++++ ...ather-operator-release-4.22-periodics.yaml | 85 +++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml b/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml index 347b05206cf40..8a733824d94d3 100644 --- a/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml @@ -191,6 +191,68 @@ tests: requests: cpu: 100m workflow: ipi-gcp +- as: e2e-hypershift-operator-weekly + cron: '@weekly' + steps: + cluster_profile: openshift-org-aws + dependency_overrides: + OO_INDEX: quay.io/redhat-user-workloads/ocp-art-tenant/art-fbc:ocp__4.22__ose-support-log-gather-rhel9-operator + env: + EXTRA_ARGS: --image-content-sources ${SHARED_DIR}/mgmt_icsp.yaml + OO_CHANNEL: tech-preview + OO_INSTALL_NAMESPACE: must-gather-operator + OO_PACKAGE: support-log-gather-operator + OO_TARGET_NAMESPACES: '!all' + test: + - ref: ipi-install-rbac + - as: setup-konflux-image-access + cli: latest + commands: | + oc extract secret/pull-secret -n openshift-config --confirm --to /tmp + jq -s '.[0].auths += .[1].auths | .[0]' /tmp/.dockerconfigjson /var/run/secrets/pull-secret/.dockerconfigjson > /tmp/merged-pullsecret.json + oc set data secret/pull-secret -n openshift-config --from-file=.dockerconfigjson=/tmp/merged-pullsecret.json + cat > ${SHARED_DIR}/mgmt_icsp.yaml <<'EOF' + - mirrors: + - quay.io/redhat-user-workloads/ocp-art-tenant/art-images-share + source: registry.redhat.io/openshift4/ose-support-log-gather-rhel9-operator + - mirrors: + - quay.io/redhat-user-workloads/ocp-art-tenant/art-images-share + source: registry.redhat.io/openshift4/ose-support-log-gather-operator-bundle + - mirrors: + - quay.io/redhat-user-workloads/ocp-art-tenant/art-images-share + source: registry.redhat.io/openshift4/ose-must-gather-rhel9 + EOF + credentials: + - mount_path: /var/run/secrets/pull-secret + name: deploy-konflux-operator-art-image-share + namespace: test-credentials + from: src + resources: + requests: + cpu: 100m + - ref: optional-operators-subscribe + - as: verify-install + cli: latest + commands: | + oc -n must-gather-operator rollout status deployment must-gather-operator + from: src + resources: + requests: + cpu: 100m + - as: test + cli: latest + commands: | + export CASE_MANAGEMENT_CREDS_CONFIG_DIR=/var/run/secrets/must-gather-operator/case-management-creds + make test-e2e + credentials: + - mount_path: /var/run/secrets/must-gather-operator/case-management-creds + name: case-management-creds + namespace: test-credentials + from: src + resources: + requests: + cpu: 100m + workflow: hypershift-hostedcluster-workflow - always_run: false as: e2e-gcp-operator-rhcos10-fips optional: true diff --git a/ci-operator/jobs/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22-periodics.yaml b/ci-operator/jobs/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22-periodics.yaml index 453d54e406047..11379c54b2bf4 100644 --- a/ci-operator/jobs/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22-periodics.yaml +++ b/ci-operator/jobs/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22-periodics.yaml @@ -84,3 +84,88 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + cron: '@weekly' + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.openshift + extra_refs: + - base_ref: release-4.22 + org: openshift + repo: must-gather-operator + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile.openshift + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-must-gather-operator-release-4.22-e2e-hypershift-operator-weekly + 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 + - --target=e2e-hypershift-operator-weekly + 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/ci-pull-credentials + name: ci-pull-credentials + 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: ci-pull-credentials + secret: + secretName: ci-pull-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 From 7e9f05fe4c39666a839e2749944467c85eb4ad2d Mon Sep 17 00:00:00 2001 From: Shivprakash Muley Date: Fri, 15 May 2026 16:39:03 +0530 Subject: [PATCH 2/3] MG-272: Added --multi-arch --- .../openshift-must-gather-operator-release-4.22.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml b/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml index 8a733824d94d3..591393c1b77be 100644 --- a/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/must-gather-operator/openshift-must-gather-operator-release-4.22.yaml @@ -198,7 +198,7 @@ tests: dependency_overrides: OO_INDEX: quay.io/redhat-user-workloads/ocp-art-tenant/art-fbc:ocp__4.22__ose-support-log-gather-rhel9-operator env: - EXTRA_ARGS: --image-content-sources ${SHARED_DIR}/mgmt_icsp.yaml + EXTRA_ARGS: --multi-arch --image-content-sources ${SHARED_DIR}/mgmt_icsp.yaml OO_CHANNEL: tech-preview OO_INSTALL_NAMESPACE: must-gather-operator OO_PACKAGE: support-log-gather-operator From 17f335c8d7727f707399f27e5743c943425038f9 Mon Sep 17 00:00:00 2001 From: Shivprakash Muley Date: Fri, 15 May 2026 17:52:07 +0530 Subject: [PATCH 3/3] MG-272: Added --multi-arch in create-hostedcluster step --- .../hypershift-hostedcluster-create-hostedcluster-commands.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-operator/step-registry/hypershift/hostedcluster/create/hostedcluster/hypershift-hostedcluster-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/hostedcluster/create/hostedcluster/hypershift-hostedcluster-create-hostedcluster-commands.sh index 180e75597331c..4de08bff25620 100755 --- a/ci-operator/step-registry/hypershift/hostedcluster/create/hostedcluster/hypershift-hostedcluster-create-hostedcluster-commands.sh +++ b/ci-operator/step-registry/hypershift/hostedcluster/create/hostedcluster/hypershift-hostedcluster-create-hostedcluster-commands.sh @@ -144,6 +144,10 @@ case "${PLATFORM}" in ARGS+=( --feature-set "${GUEST_FEATURE_SET}") fi + if [[ -n "${EXTRA_ARGS}" ]]; then + ARGS+=( ${EXTRA_ARGS} ) + fi + echo "Creating cluster with the following arguments:" echo "${ARGS[@]}" /usr/bin/hypershift create cluster aws "${ARGS[@]}"