From 8dd2df49089e0ff751e1e8818b1cfe214d8c7c72 Mon Sep 17 00:00:00 2001 From: mliptak0 Date: Wed, 24 Jun 2026 13:19:38 +0200 Subject: [PATCH 1/4] HYPERFLEET-1108 - feat: Pass E2E_RUN_ID when running make install-hyperfleet (prerequisite for labeling e2e resources) --- .../e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh index 4c831b9539288..09a36c5ab6c64 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh @@ -64,7 +64,7 @@ git clone --depth 1 "https://github.com/openshift-hyperfleet/hyperfleet-infra.gi cd /tmp/hyperfleet-infra HELMFILE_ENV="e2e-gcp" -NAMESPACE=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet +NAMESPACE=${NAMESPACE_NAME} E2E_RUN_ID=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet # Save installed charts for cleanup HELMFILE_JSON="${SHARED_DIR}/helm-release-${NAMESPACE_NAME}.json" From 04c4892031c4c03963d055c7c511354f6b6df2e5 Mon Sep 17 00:00:00 2001 From: mliptak0 Date: Tue, 7 Jul 2026 11:45:27 +0200 Subject: [PATCH 2/4] HYPERFLEET-1108 - feat: Pass E2E_RUN_ID to e2e test run --- .../e2e/test/openshift-hyperfleet-e2e-test-commands.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh index 77897aed549b8..9b13bdd1f5751 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh @@ -52,9 +52,8 @@ export NAMESPACE GCP_PROJECT_ID=$(cat "${SHARED_DIR}/gcp_project_id") export GCP_PROJECT_ID -# Extract run id from shared dir -RUN_ID=$(cat "${SHARED_DIR}/run_id") -export RUN_ID +# Extract run id from shared dir (used for E2E_RUN_ID below) +E2E_RUN_ID=$(cat "${SHARED_DIR}/run_id") # Extract kubeconfig from shared dir export KUBECONFIG="${SHARED_DIR}/kubeconfig" @@ -72,4 +71,4 @@ export API_CHART_REF="${API_CHART_REF:-main}" export API_CHART_PATH="${API_CHART_PATH:-charts}" # Run e2e tests via --label-filter -"${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml" +E2E_RUN_ID="${E2E_RUN_ID}" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml" From 1f6c060c7d896e90fa34c5f49bc27fae1c121044 Mon Sep 17 00:00:00 2001 From: mliptak0 Date: Tue, 7 Jul 2026 11:57:08 +0200 Subject: [PATCH 3/4] HYPERFLEET-1108 - feat: Rename e2e-run-id to run-id --- .../e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh | 2 +- .../e2e/test/openshift-hyperfleet-e2e-test-commands.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh index 09a36c5ab6c64..3a5948c6f5bcb 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/setup/openshift-hyperfleet-e2e-setup-commands.sh @@ -64,7 +64,7 @@ git clone --depth 1 "https://github.com/openshift-hyperfleet/hyperfleet-infra.gi cd /tmp/hyperfleet-infra HELMFILE_ENV="e2e-gcp" -NAMESPACE=${NAMESPACE_NAME} E2E_RUN_ID=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet +NAMESPACE=${NAMESPACE_NAME} RUN_ID=${NAMESPACE_NAME} HELMFILE_ENV="${HELMFILE_ENV}" make install-hyperfleet # Save installed charts for cleanup HELMFILE_JSON="${SHARED_DIR}/helm-release-${NAMESPACE_NAME}.json" diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh index 9b13bdd1f5751..e6e0a3228d747 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh @@ -52,8 +52,8 @@ export NAMESPACE GCP_PROJECT_ID=$(cat "${SHARED_DIR}/gcp_project_id") export GCP_PROJECT_ID -# Extract run id from shared dir (used for E2E_RUN_ID below) -E2E_RUN_ID=$(cat "${SHARED_DIR}/run_id") +# Extract run id from shared dir (used for RUN_ID below) +RUN_ID=$(cat "${SHARED_DIR}/run_id") # Extract kubeconfig from shared dir export KUBECONFIG="${SHARED_DIR}/kubeconfig" @@ -71,4 +71,4 @@ export API_CHART_REF="${API_CHART_REF:-main}" export API_CHART_PATH="${API_CHART_PATH:-charts}" # Run e2e tests via --label-filter -E2E_RUN_ID="${E2E_RUN_ID}" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml" +RUN_ID="${RUN_ID}" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml" From ecb35333c7147e2f9762122c2e49ac6be326538a Mon Sep 17 00:00:00 2001 From: mliptak0 Date: Tue, 7 Jul 2026 13:34:57 +0200 Subject: [PATCH 4/4] HYPERFLEET-1108 - feat: Cleanup --- .../e2e/test/openshift-hyperfleet-e2e-test-commands.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh index e6e0a3228d747..aa467ca68c0d4 100644 --- a/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift-hyperfleet/e2e/test/openshift-hyperfleet-e2e-test-commands.sh @@ -52,9 +52,6 @@ export NAMESPACE GCP_PROJECT_ID=$(cat "${SHARED_DIR}/gcp_project_id") export GCP_PROJECT_ID -# Extract run id from shared dir (used for RUN_ID below) -RUN_ID=$(cat "${SHARED_DIR}/run_id") - # Extract kubeconfig from shared dir export KUBECONFIG="${SHARED_DIR}/kubeconfig" # Export adapter parameters for the test @@ -71,4 +68,4 @@ export API_CHART_REF="${API_CHART_REF:-main}" export API_CHART_PATH="${API_CHART_PATH:-charts}" # Run e2e tests via --label-filter -RUN_ID="${RUN_ID}" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml" +RUN_ID="$(cat "${SHARED_DIR}/run_id")" "${E2E_BIN}" test --label-filter="${LABEL_FILTER}" --flake-attempts="${FLAKE_ATTEMPTS:-2}" --junit-report "${ARTIFACT_DIR}/junit.xml"