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

Bump and release zenko 2.6.70 #2171

Merged
merged 18 commits into from
Nov 19, 2024
Merged

Bump and release zenko 2.6.70 #2171

merged 18 commits into from
Nov 19, 2024

Conversation

francoisferrand
Copy link
Contributor

@francoisferrand francoisferrand commented Nov 18, 2024

Issue: ZENKO-4919

francoisferrand and others added 16 commits November 12, 2024 16:24
This is needed to avoid conflict with internal prometheus service,
since we are running in the same cluster.

Issue: ZENKO-4876
ServiceMonitor were not scrapped.

Issue: ZENKO-4876
When an SHA1 is used which is not the tip of the branch, it is not
available after a `git clone` (which fetches only commits reachable
from current branches).

This causes issues if a build is started while the component branch with
the commit has been rewritten (rebase...)

To overcome this, the safe way is to explicitely fetch the commit: which
works for any commit (branch, tag, sha1).

Issue: ZENKO-4876
No reason to keep separate, and it helps avoid a github bug/limitation
when creating a check: and the

Issue: ZENKO-4876
The trigger seem to be
aws/aws-sdk-js#1678
... causing the callback to be called twice, which
is a problem in these loops.
Issue: ZENKO-4925
@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Hello francoisferrand,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@KillianG KillianG changed the base branch from development/2.10 to development/2.6 November 18, 2024 15:42
@scality scality deleted a comment from bert-e Nov 18, 2024
@scality scality deleted a comment from bert-e Nov 18, 2024
We need to retry `kubectl apply`, esp as  mutating web hooks may not be
ready, c.f. [1].

[1] cert-manager/cert-manager#2908

Issue: ZENKO-4919
@francoisferrand
Copy link
Contributor Author

/approve

@scality scality deleted a comment from bert-e Nov 18, 2024
@scality scality deleted a comment from bert-e Nov 18, 2024
@scality scality deleted a comment from bert-e Nov 18, 2024
@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.7/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.8/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.7/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.10/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.7/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 18, 2024

Build failed

The build for commit did not succeed in branch w/2.9/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

Build failed

The build for commit did not succeed in branch w/2.7/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

Build failed

The build for commit did not succeed in branch w/2.9/improvement/ZENKO-4919.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 19, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.6

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

  • ✔️ development/2.10

The following branches have NOT changed:

  • development/2.5

Please check the status of the associated issue ZENKO-4919.

Goodbye francoisferrand.

The following options are set: approve

@bert-e bert-e merged commit 6cd4998 into development/2.6 Nov 19, 2024
14 checks passed
@bert-e bert-e deleted the improvement/ZENKO-4919 branch November 19, 2024 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants