Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLOUD-869 Fallback to merge-base if commit hash is invalid #1957

Merged
merged 2 commits into from
Jan 24, 2025

Conversation

ptankov
Copy link
Contributor

@ptankov ptankov commented Jan 23, 2025

CLOUD-869 Powered by Pull Request Badge

CHANGE DESCRIPTION

Problem:
Sometimes git diff --name-only xxxxx HEAD can result in:

fatal: bad object xxxxx

Cause:
The commit is from a different branch or repository.
or
The commit history has been rewritten (e.g., through a rebase or force-push).

Solution:
Validate the commit hash before running git diff and fallback to merge-base if the commit is invalid.

CHECKLIST

Jira

  • Is the Jira ticket created and referenced properly?
  • Does the Jira ticket have the proper statuses for documentation (Needs Doc) and QA (Needs QA)?
  • Does the Jira ticket link to the proper milestone (Fix Version field)?

Tests

  • Is an E2E test/test case added for the new feature/change?
  • Are unit tests added where appropriate?
  • Are OpenShift compare files changed for E2E tests (compare/*-oc.yml)?

Config/Logging/Testability

  • Are all needed new/changed options added to default YAML files?
  • Are all needed new/changed options added to the Helm Chart?
  • Did we add proper logging messages for operator actions?
  • Did we ensure compatibility with the previous version or cluster upgrade process?
  • Does the change support oldest and newest supported PXC version?
  • Does the change support oldest and newest supported Kubernetes version?

@pull-request-size pull-request-size bot added the size/S 10-29 lines label Jan 23, 2025
@ptankov ptankov requested review from hors, egegunes and gkech January 23, 2025 17:35
@JNKPercona
Copy link
Collaborator

Test name Status
affinity-8-0 passed
auto-tuning-8-0 passed
cross-site-8-0 passed
custom-users-8-0 passed
demand-backup-cloud-8-0 passed
demand-backup-encrypted-with-tls-8-0 passed
demand-backup-8-0 passed
haproxy-5-7 passed
haproxy-8-0 passed
init-deploy-5-7 passed
init-deploy-8-0 passed
limits-8-0 passed
monitoring-2-0-8-0 passed
one-pod-5-7 passed
one-pod-8-0 passed
pitr-8-0 passed
pitr-gap-errors-8-0 passed
proxy-protocol-8-0 passed
proxysql-sidecar-res-limits-8-0 passed
pvc-resize-5-7 passed
pvc-resize-8-0 passed
recreate-8-0 passed
restore-to-encrypted-cluster-8-0 passed
scaling-proxysql-8-0 passed
scaling-8-0 passed
scheduled-backup-5-7 passed
scheduled-backup-8-0 passed
security-context-8-0 passed
smart-update1-8-0 passed
smart-update2-8-0 passed
storage-8-0 passed
tls-issue-cert-manager-ref-8-0 passed
tls-issue-cert-manager-8-0 passed
tls-issue-self-8-0 passed
upgrade-consistency-8-0 passed
upgrade-haproxy-5-7 passed
upgrade-haproxy-8-0 passed
upgrade-proxysql-5-7 passed
upgrade-proxysql-8-0 passed
users-5-7 passed
users-8-0 passed
validation-hook-8-0 passed
We run 42 out of 42

commit: 556b1a8
image: perconalab/percona-xtradb-cluster-operator:PR-1957-556b1a8b

@pull-request-size pull-request-size bot added size/XS 0-9 lines and removed size/S 10-29 lines labels Jan 24, 2025
@hors hors merged commit 144c157 into main Jan 24, 2025
14 checks passed
@hors hors deleted the CLOUD-869-fallback-to-merge-base-if-commit-invalid branch January 24, 2025 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XS 0-9 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants