From 9cb748bcdeda4da3d429bff4f93f59549e2760b5 Mon Sep 17 00:00:00 2001 From: wangke19 Date: Mon, 10 Mar 2025 20:29:31 +0800 Subject: [PATCH] Debug for hypershift install --- ...s-private-release-4.17__amd64-nightly.yaml | 14 ++++ ...-tests-private-release-4.17-periodics.yaml | 83 +++++++++++++++++++ ...mce-agent-create-hostedcluster-commands.sh | 14 ++++ 3 files changed, 111 insertions(+) diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml index b2a688737c4e1..24a01e51cc773 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17__amd64-nightly.yaml @@ -2020,6 +2020,20 @@ tests: test: - chain: openshift-e2e-test-hypershift-qe workflow: cucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest +- as: baremetalds-hypershift-agent-mce-guest-arm64-f28 + capabilities: + - arm64 + cron: 22 15 4 * * + steps: + cluster_profile: equinix-ocp-metal-qe + env: + LVM_OPERATOR_SUB_CHANNEL: stable-4.17 + MCE_VERSION: "2.7" + TEST_FILTERS: ~ChkUpgrade&;~DisconnectedOnly&;~NonPreRelease&;~HyperShiftMGMT&;~MicroShiftOnly&;~NonHyperShiftHOST&;~Serial&;~Disruptive& + TEST_TIMEOUT: "30" + test: + - chain: openshift-e2e-test-hypershift-qe + workflow: cucushift-installer-rehearse-baremetalds-assisted-hypershift-agent-mce-guest - as: baremetalds-hypershift-agent-mce-guest-f14-destructive cluster: build05 cron: 34 8 10,26 * * diff --git a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml index a6c9990358da4..ce0b8e51d3537 100644 --- a/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.17-periodics.yaml @@ -29340,6 +29340,89 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build07 + cron: 22 15 4 * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.17 + org: openshift + repo: openshift-tests-private + labels: + capability/arm64: arm64 + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal-qe + ci-operator.openshift.io/variant: amd64-nightly + ci.openshift.io/generator: prowgen + job-release: "4.17" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-openshift-tests-private-release-4.17-amd64-nightly-baremetalds-hypershift-agent-mce-guest-arm64-f28 + 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 + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=baremetalds-hypershift-agent-mce-guest-arm64-f28 + - --variant=amd64-nightly + 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: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + 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: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - 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 cron: 34 8 10,26 * * diff --git a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh index 76cabef112d10..72beec68650a1 100644 --- a/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh +++ b/ci-operator/step-registry/hypershift/mce/agent/create/hostedcluster/hypershift-mce-agent-create-hostedcluster-commands.sh @@ -83,6 +83,18 @@ if [ ! -f "${SHARED_DIR}/id_rsa.pub" ] && [ -f "${CLUSTER_PROFILE_DIR}/ssh-publi cp "${CLUSTER_PROFILE_DIR}/ssh-publickey" "${SHARED_DIR}/id_rsa.pub" fi +echo "/tmp/${HYPERSHIFT_NAME} create cluster agent ${EXTRA_ARGS} \ + --name=${CLUSTER_NAME} \ + --pull-secret=/tmp/.dockerconfigjson \ + --agent-namespace=\"${AGENT_NAMESPACE}\" \ + --namespace local-cluster \ + --base-domain=${BASEDOMAIN} \ + --api-server-address=api.${CLUSTER_NAME}.${BASEDOMAIN} \ + --image-content-sources \"${SHARED_DIR}/mgmt_icsp.yaml\" \ + --ssh-key=\"${SHARED_DIR}/id_rsa.pub\" \ + --release-image ${RELEASE_IMAGE}" > /tmp/agent-create-command.sh + + /tmp/${HYPERSHIFT_NAME} create cluster agent ${EXTRA_ARGS} \ --name=${CLUSTER_NAME} \ --pull-secret=/tmp/.dockerconfigjson \ @@ -94,6 +106,8 @@ fi --ssh-key="${SHARED_DIR}/id_rsa.pub" \ --release-image ${RELEASE_IMAGE} +sleep 2h + if (( $(awk 'BEGIN {print ("'"$MCE_VERSION"'" < 2.4)}') )); then echo "MCE version is less than 2.4" oc annotate hostedclusters -n local-cluster ${CLUSTER_NAME} "cluster.open-cluster-management.io/managedcluster-name=${CLUSTER_NAME}" --overwrite