From e1234cec39d2355978b484989e13c60b8de08621 Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Wed, 25 Feb 2026 17:22:28 +0800 Subject: [PATCH] Fix microshift step registry to not depend on job's build_root --- .../openshift-microshift-e2e-bare-metal-tests-ref.yaml | 5 ++++- .../openshift-microshift-e2e-metal-tests-ref.yaml | 5 ++++- ...hift-e2e-openshift-conformance-build-and-run-ref.yaml | 5 ++++- .../includes/openshift-microshift-includes-commands.sh | 9 ++++++++- ...openshift-microshift-infra-conformance-setup-ref.yaml | 5 ++++- ...enshift-microshift-infra-install-from-source-ref.yaml | 5 ++++- .../openshift-microshift-infra-iso-boot-ref.yaml | 5 ++++- .../infra/pcp/openshift-microshift-infra-pcp-ref.yaml | 5 ++++- .../pmlogs/openshift-microshift-infra-pmlogs-ref.yaml | 5 ++++- .../openshift-microshift-infra-rpm-install-aws-ref.yaml | 5 ++++- 10 files changed, 44 insertions(+), 10 deletions(-) diff --git a/ci-operator/step-registry/openshift/microshift/e2e/bare-metal-tests/openshift-microshift-e2e-bare-metal-tests-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/bare-metal-tests/openshift-microshift-e2e-bare-metal-tests-ref.yaml index 91a3b5bda3895..4a43cdf5f3c0a 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/bare-metal-tests/openshift-microshift-e2e-bare-metal-tests-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/bare-metal-tests/openshift-microshift-e2e-bare-metal-tests-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-e2e-bare-metal-tests - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 commands: openshift-microshift-e2e-bare-metal-tests-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml index 3e89236ca2dc1..c2609552d73bd 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/metal-tests/openshift-microshift-e2e-metal-tests-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-e2e-metal-tests - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 commands: openshift-microshift-e2e-metal-tests-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-build-and-run/openshift-microshift-e2e-openshift-conformance-build-and-run-ref.yaml b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-build-and-run/openshift-microshift-e2e-openshift-conformance-build-and-run-ref.yaml index 71254f988bb78..a8b11ab2df5c0 100644 --- a/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-build-and-run/openshift-microshift-e2e-openshift-conformance-build-and-run-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/e2e/openshift-conformance-build-and-run/openshift-microshift-e2e-openshift-conformance-build-and-run-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-e2e-openshift-conformance-build-and-run - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 commands: openshift-microshift-e2e-openshift-conformance-build-and-run-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh index 3a5522fd8c52a..6a910298a61ca 100644 --- a/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh +++ b/ci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh @@ -194,8 +194,15 @@ function download_microshift_scripts() { } function ci_get_clonerefs() { + local arch + arch=$(uname -m) + case "$arch" in + x86_64) arch="amd64" ;; + aarch64) arch="arm64" ;; + *) echo "Unsupported architecture: $arch"; exit 1 ;; + esac curl -L \ - "https://github.com/microshift-io/prow/releases/download/nightly/clonerefs-linux-$(go env GOARCH)" \ + "https://github.com/microshift-io/prow/releases/download/nightly/clonerefs-linux-${arch}" \ -o /tmp/clonerefs chmod +x /tmp/clonerefs } diff --git a/ci-operator/step-registry/openshift/microshift/infra/conformance-setup/openshift-microshift-infra-conformance-setup-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/conformance-setup/openshift-microshift-infra-conformance-setup-ref.yaml index e2d6d029f3bc1..726d9071705f1 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/conformance-setup/openshift-microshift-infra-conformance-setup-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/conformance-setup/openshift-microshift-infra-conformance-setup-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-conformance-setup - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 grace_period: 10m commands: openshift-microshift-infra-conformance-setup-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/install-from-source/openshift-microshift-infra-install-from-source-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/install-from-source/openshift-microshift-infra-install-from-source-ref.yaml index 4487eba3a470c..723486e103b2a 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/install-from-source/openshift-microshift-infra-install-from-source-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/install-from-source/openshift-microshift-infra-install-from-source-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-install-from-source - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 grace_period: 10m commands: openshift-microshift-infra-install-from-source-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml index cc3c9b2251ef9..80d5454b803f9 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/iso-boot/openshift-microshift-infra-iso-boot-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-iso-boot - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 grace_period: 10m commands: openshift-microshift-infra-iso-boot-commands.sh resources: diff --git a/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml index 961bafc011c9f..1ce227fea1fab 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/pcp/openshift-microshift-infra-pcp-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-pcp - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 commands: openshift-microshift-infra-pcp-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml index e4555d1eaf836..324bb9912587d 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/pmlogs/openshift-microshift-infra-pmlogs-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-pmlogs - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 commands: openshift-microshift-infra-pmlogs-commands.sh resources: requests: diff --git a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml index ed475e3458835..28aed4dec2961 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml +++ b/ci-operator/step-registry/openshift/microshift/infra/rpm-install-aws/openshift-microshift-infra-rpm-install-aws-ref.yaml @@ -1,6 +1,9 @@ ref: as: openshift-microshift-infra-rpm-install-aws - from: root + from_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 cli: latest grace_period: 10m commands: openshift-microshift-infra-rpm-install-aws-commands.sh