Skip to content

Feature/thanos query file service discovery#4546

Merged
bert-e merged 4 commits intodevelopment/129.0from
feature/thanos-query-file-service-discovery
Mar 27, 2025
Merged

Feature/thanos query file service discovery#4546
bert-e merged 4 commits intodevelopment/129.0from
feature/thanos-query-file-service-discovery

Conversation

@eg-ayoub
Copy link
Copy Markdown
Contributor

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner March 26, 2025 13:11
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Hello eg-ayoub,

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.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@eg-ayoub eg-ayoub force-pushed the feature/thanos-query-file-service-discovery branch from 0bb17e0 to 448d1f0 Compare March 26, 2025 13:15
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Conflict

There is a conflict between your branch feature/thanos-query-file-service-discovery and the
destination branch development/130.0.

Please resolve the conflict on the feature branch (feature/thanos-query-file-service-discovery).

git fetch && \
git checkout origin/feature/thanos-query-file-service-discovery && \
git merge origin/development/130.0

Resolve merge conflicts and commit

git push origin HEAD:feature/thanos-query-file-service-discovery

@eg-ayoub eg-ayoub changed the base branch from development/130.0 to development/129.0 March 26, 2025 13:16
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

Comment thread salt/metalk8s/addons/prometheus-operator/deployed/thanos-query-sd-files.sls Outdated
@eg-ayoub eg-ayoub force-pushed the feature/thanos-query-file-service-discovery branch from 448d1f0 to 32a2089 Compare March 26, 2025 13:23
@eg-ayoub eg-ayoub force-pushed the feature/thanos-query-file-service-discovery branch from 32a2089 to f750dd1 Compare March 26, 2025 13:25
@eg-ayoub
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 26, 2025

Build failed

The build for commit did not succeed in branch feature/thanos-query-file-service-discovery

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 27, 2025

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/129.0

  • ✔️ development/130.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 27, 2025

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Mar 27, 2025

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

  • ✔️ development/129.0

  • ✔️ development/130.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye eg-ayoub.

@bert-e bert-e merged commit 6477f95 into development/129.0 Mar 27, 2025
30 checks passed
@bert-e bert-e deleted the feature/thanos-query-file-service-discovery branch March 27, 2025 20:56
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