From da3305a45a328192b4becace048c2b5204ee3dca Mon Sep 17 00:00:00 2001 From: Ciaran Roche Date: Mon, 12 Oct 2026 12:12:36 +0100 Subject: [PATCH] openshift-hyperfleet: squash on merge, bump hyperfleet-hooks to v0.3.0 Sets Tide's merge method to squash for the openshift-hyperfleet organisation. The team's commit standard already assumes squash merges; today Tide merges with merge commits. The squash commit title and body come from the repository settings, which are set to the PR title and the PR body on every repository in the organisation, so no merge commit template is needed here. Prow's per-org config merging only accepts branch-protection, slack_reporter_configs, tide.merge_method and tide.queries in any case. Bumps the pinned hyperfleet-hooks release in the commitlint step to v0.3.0, where commitlint --pr validates the PR title only. With squash on merge the title is the only message that reaches main, and authors push fixes as new commits during review instead of amending. --- .../hyperfleet/commitlint/hyperfleet-commitlint-commands.sh | 2 +- .../prow/02_config/openshift-hyperfleet/_prowconfig.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 core-services/prow/02_config/openshift-hyperfleet/_prowconfig.yaml diff --git a/ci-operator/step-registry/hyperfleet/commitlint/hyperfleet-commitlint-commands.sh b/ci-operator/step-registry/hyperfleet/commitlint/hyperfleet-commitlint-commands.sh index 5783f2c4ba0f..4f2ea9cc4594 100755 --- a/ci-operator/step-registry/hyperfleet/commitlint/hyperfleet-commitlint-commands.sh +++ b/ci-operator/step-registry/hyperfleet/commitlint/hyperfleet-commitlint-commands.sh @@ -9,7 +9,7 @@ if [ -z "${PULL_BASE_SHA:-}" ]; then exit 1 fi -HOOKS_VERSION="v0.2.1" +HOOKS_VERSION="v0.3.0" HOOKS_URL="https://github.com/openshift-hyperfleet/hyperfleet-hooks/releases/download/${HOOKS_VERSION}/hyperfleet-hooks-linux-amd64" HOOKS_BIN="/tmp/hyperfleet-hooks" diff --git a/core-services/prow/02_config/openshift-hyperfleet/_prowconfig.yaml b/core-services/prow/02_config/openshift-hyperfleet/_prowconfig.yaml new file mode 100644 index 000000000000..2ee003d63761 --- /dev/null +++ b/core-services/prow/02_config/openshift-hyperfleet/_prowconfig.yaml @@ -0,0 +1,3 @@ +tide: + merge_method: + openshift-hyperfleet: squash