Change output to outputformat as param changed in drctl #2154

KillianG · 2024-09-24T14:37:15Z

DRCTL status now fails if it, actually fails

DRCTL status now fails if it, actually fails Issue: ZENKO-4903

bert-e · 2024-09-24T14:37:19Z

Hello killiang,

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 · 2024-09-24T14:46:21Z

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.

KillianG · 2024-09-24T14:46:34Z

/create_integration_branches

bert-e · 2024-09-24T14:46:47Z

Integration data created

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

this pull request will merge bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time into
development/2.6
w/2.7/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time will be merged into development/2.7
w/2.8/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time will be merged into development/2.8
w/2.9/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time will be merged into development/2.9
w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time will be merged into development/2.10

The following branches will NOT be impacted:

development/2.5

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: create_integration_branches

bert-e · 2024-09-24T14:46:49Z

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

francoisferrand · 2024-09-25T08:38:54Z

.github/workflows/end2end.yaml

+          tmate-server-port: ${{ secrets.TMATE_SERVER_PORT }}
+          tmate-server-rsa-fingerprint: ${{ secrets.TMATE_SERVER_RSA_FINGERPRINT }}
+          tmate-server-ed25519-fingerprint: ${{ secrets.TMATE_SERVER_ED25519_FINGERPRINT }}
+        timeout-minutes: 30


should not be commited!

francoisferrand · 2024-09-26T11:56:17Z

/after_pull_request=2155

bert-e · 2024-09-26T11:56:22Z

Waiting for other pull request(s)

The current pull request is locked by the after_pull_request option.

In order for me to merge this pull request, run the following actions first:

➡️ Merge the OPEN pull request:

pull request Release 2.10.0 #2155

Alternatively, delete all the after_pull_request comments from this pull request.

The following options are set: after_pull_request, create_integration_branches

…93be213437e3ff5754cd599b040946b5cca43ca45c2047114 in end2end.yaml

bert-e · 2024-09-27T12:10:38Z

Conflict

A conflict has been raised during the update of
integration branch w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time with contents from w/2.9/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
and development/2.10.

Please resolve the conflict on the integration branch (w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
 $ git pull  # or "git reset --hard origin/w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time"
 $ git merge origin/development/2.10
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/2.9/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time

The following options are set: after_pull_request, create_integration_branches

bert-e · 2024-09-27T12:23:01Z

Incorrect fix version

The Fix Version/s in issue ZENKO-4903 contains:

2.10.0
2.6.68
2.7.64
2.8.44
2.9.21

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

2.10.1
2.6.68
2.7.64
2.8.44
2.9.21

Please check the Fix Version/s of ZENKO-4903, or the target
branch of this pull request.

The following options are set: after_pull_request, create_integration_branches

…2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9 in end2end.yaml

bert-e · 2024-09-27T12:30:58Z

Conflict

A conflict has been raised during the update of
integration branch w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time with contents from w/2.9/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
and development/2.10.

Please resolve the conflict on the integration branch (w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
 $ git pull  # or "git reset --hard origin/w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time"
 $ git merge origin/development/2.10
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/2.9/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.10/bugfix/ZENKO-4903-fix-drctl-status-taking-too-much-time

The following options are set: after_pull_request, create_integration_branches

bert-e · 2024-09-27T13:16:01Z

Incorrect fix version

The Fix Version/s in issue ZENKO-4903 contains:

2.10.0
2.6.68
2.7.64
2.8.44
2.9.21

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

2.10.1
2.6.68
2.7.64
2.8.44
2.9.21

Please check the Fix Version/s of ZENKO-4903, or the target
branch of this pull request.

The following options are set: after_pull_request, create_integration_branches

Change output to outputformat as param changed in drctl

037b8d2

DRCTL status now fails if it, actually fails Issue: ZENKO-4903

bump drctl to custom version for test

874ab02

KillianG requested review from williamlardier, francoisferrand, Kerkesni and benzekrimaha September 24, 2024 14:42

scality deleted a comment from bert-e Sep 24, 2024

Add debug step to SSH into runner during end-to-end tests

b20cda5

francoisferrand reviewed Sep 25, 2024

View reviewed changes

KillianG marked this pull request as draft September 25, 2024 08:47

Update zenko-operator tag in deps.yaml

291c803

KillianG added 6 commits September 26, 2024 15:24

Update zenko-operator tag in deps.yaml

89ccf8e

Update zenko-operator tag in deps.yaml

e4e6fd7

Update WORKER_COUNT to 3 in end2end.yaml

425f291

Update sinkZenkoNamespace to sinkZenkoDrNamespace in drctl.ts and pra.ts

369d7ab

Upgrade kind node image version

1d62b29

Update KIND_NODE_IMAGE to kindest/node:v1.30.4@sha256:976ea815844d5fa…

c751ea1

…93be213437e3ff5754cd599b040946b5cca43ca45c2047114 in end2end.yaml

KillianG added 2 commits September 27, 2024 14:24

Update zenko-operator tag in deps.yaml

f743936

Update KIND_NODE_IMAGE to kindest/node:v1.23.4@sha256:0e34f0d0fd448aa…

51ccd6b

…2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9 in end2end.yaml

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change output to outputformat as param changed in drctl #2154

Change output to outputformat as param changed in drctl #2154

KillianG commented Sep 24, 2024

bert-e commented Sep 24, 2024

bert-e commented Sep 24, 2024

KillianG commented Sep 24, 2024

bert-e commented Sep 24, 2024

bert-e commented Sep 24, 2024

francoisferrand Sep 25, 2024

francoisferrand commented Sep 26, 2024

bert-e commented Sep 26, 2024

bert-e commented Sep 27, 2024

bert-e commented Sep 27, 2024

bert-e commented Sep 27, 2024

bert-e commented Sep 27, 2024

Change output to outputformat as param changed in drctl #2154

Are you sure you want to change the base?

Change output to outputformat as param changed in drctl #2154

Conversation

KillianG commented Sep 24, 2024

bert-e commented Sep 24, 2024

Hello killiang,

bert-e commented Sep 24, 2024

Request integration branches

KillianG commented Sep 24, 2024

bert-e commented Sep 24, 2024

Integration data created

bert-e commented Sep 24, 2024

Waiting for approval

francoisferrand Sep 25, 2024

Choose a reason for hiding this comment

francoisferrand commented Sep 26, 2024

bert-e commented Sep 26, 2024

Waiting for other pull request(s)

bert-e commented Sep 27, 2024

Conflict

bert-e commented Sep 27, 2024

Incorrect fix version

bert-e commented Sep 27, 2024

Conflict

bert-e commented Sep 27, 2024

Incorrect fix version